X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=24aa84e357a129db9fcea63b43cec986b114407a;hp=789d8eabd14c88c67524b632b7dbe1debbe410fd;hb=9abaf929b9da3158e9b7f799775ac56e88d28740;hpb=a1906d9fe3e565bbd874df72e8552fa7daf9fb9a

diff --git a/server.cpp b/server.cpp
index 789d8ea..24aa84e 100644
--- a/server.cpp
+++ b/server.cpp
@@ -14,6 +14,8 @@
 #include <utility>
 #include <vector>
 
+#include "accesslog.h"
+#include "log.h"
 #include "markpool.h"
 #include "mutexlock.h"
 #include "parse.h"
@@ -23,6 +25,8 @@
 
 using namespace std;
 
+extern AccessLogThread *access_log;
+
 Server::Server()
 {
 	pthread_mutex_init(&mutex, NULL);
@@ -30,7 +34,7 @@ Server::Server()
 
 	epoll_fd = epoll_create(1024);  // Size argument is ignored.
 	if (epoll_fd == -1) {
-		perror("epoll_fd");
+		log_perror("epoll_fd");
 		exit(1);
 	}
 }
@@ -43,7 +47,7 @@ Server::~Server()
 	} while (ret == -1 && errno == EINTR);
 
 	if (ret == -1) {
-		perror("close(epoll_fd)");
+		log_perror("close(epoll_fd)");
 	}
 }
 
@@ -71,7 +75,7 @@ void Server::do_work()
 			continue;
 		}
 		if (nfds == -1) {
-			perror("epoll_wait");
+			log_perror("epoll_wait");
 			exit(1);
 		}
 
@@ -140,7 +144,7 @@ void Server::add_client(int sock)
 	ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
 	ev.data.u64 = reinterpret_cast<uint64_t>(&clients[sock]);
 	if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
-		perror("epoll_ctl(EPOLL_CTL_ADD)");
+		log_perror("epoll_ctl(EPOLL_CTL_ADD)");
 		exit(1);
 	}
 
@@ -172,7 +176,7 @@ void Server::add_client_from_serialized(const ClientProto &client)
 	ev.data.u64 = 0;  // Keep Valgrind happy.
 	ev.data.u64 = reinterpret_cast<uint64_t>(client_ptr);
 	if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, client.sock(), &ev) == -1) {
-		perror("epoll_ctl(EPOLL_CTL_ADD)");
+		log_perror("epoll_ctl(EPOLL_CTL_ADD)");
 		exit(1);
 	}
 
@@ -253,7 +257,7 @@ read_request_again:
 			return;
 		}
 		if (ret == -1) {
-			perror("read");
+			log_perror("read");
 			close_client(client);
 			return;
 		}
@@ -267,7 +271,7 @@ read_request_again:
 	
 		switch (status) {
 		case RP_OUT_OF_SPACE:
-			fprintf(stderr, "WARNING: fd %d sent overlong request!\n", client->sock);
+			log(WARNING, "[%s] Client sent overlong request!", client->remote_addr.c_str());
 			close_client(client);
 			return;
 		case RP_NOT_FINISHED_YET:
@@ -275,7 +279,7 @@ read_request_again:
 			// See if there's more data for us.
 			goto read_request_again;
 		case RP_EXTRA_DATA:
-			fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
+			log(WARNING, "[%s] Junk data after request!", client->remote_addr.c_str());
 			close_client(client);
 			return;
 		case RP_FINISHED:
@@ -315,7 +319,7 @@ sending_header_or_error_again:
 
 		if (ret == -1) {
 			// Error! Postcondition #1.
-			perror("write");
+			log_perror("write");
 			close_client(client);
 			return;
 		}
@@ -356,8 +360,8 @@ sending_data_again:
 			return;
 		}
 		if (bytes_to_send > stream->backlog_size) {
-			fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n",
-			        client->sock,
+			log(WARNING, "[%s] Client lost %lld bytes, maybe too slow connection",
+			        client->remote_addr.c_str(),
 			        (long long int)(bytes_to_send - stream->backlog_size));
 			client->stream_pos = stream->bytes_received - stream->backlog_size;
 			client->bytes_lost += bytes_to_send - stream->backlog_size;
@@ -386,7 +390,7 @@ sending_data_again:
 		}
 		if (ret == -1) {
 			// Error, close; postcondition #1.
-			perror("sendfile");
+			log_perror("sendfile");
 			close_client(client);
 			return;
 		}
@@ -397,7 +401,7 @@ sending_data_again:
 			// We don't have any more data for this client, so put it to sleep.
 			// This is postcondition #3.
 			stream->put_client_to_sleep(client);
-		} else if (more_data && ret == bytes_to_send) {
+		} else if (more_data && size_t(ret) == bytes_to_send) {
 			goto sending_data_again;
 		}
 		break;
@@ -434,7 +438,7 @@ int Server::parse_request(Client *client)
 	}
 	if (setsockopt(client->sock, SOL_SOCKET, SO_MARK, &client->fwmark, sizeof(client->fwmark)) == -1) {                          
 		if (client->fwmark != 0) {
-			perror("setsockopt(SO_MARK)");
+			log_perror("setsockopt(SO_MARK)");
 		}
 	}
 	client->request.clear();
@@ -454,7 +458,7 @@ void Server::construct_header(Client *client)
 	ev.data.u64 = reinterpret_cast<uint64_t>(client);
 
 	if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
-		perror("epoll_ctl(EPOLL_CTL_MOD)");
+		log_perror("epoll_ctl(EPOLL_CTL_MOD)");
 		exit(1);
 	}
 }
@@ -474,7 +478,7 @@ void Server::construct_error(Client *client, int error_code)
 	ev.data.u64 = reinterpret_cast<uint64_t>(client);
 
 	if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
-		perror("epoll_ctl(EPOLL_CTL_MOD)");
+		log_perror("epoll_ctl(EPOLL_CTL_MOD)");
 		exit(1);
 	}
 }
@@ -489,7 +493,7 @@ void delete_from(vector<T> *v, T elem)
 void Server::close_client(Client *client)
 {
 	if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, client->sock, NULL) == -1) {
-		perror("epoll_ctl(EPOLL_CTL_DEL)");
+		log_perror("epoll_ctl(EPOLL_CTL_DEL)");
 		exit(1);
 	}
 
@@ -503,6 +507,9 @@ void Server::close_client(Client *client)
 		}
 	}
 
+	// Log to access_log.
+	access_log->write(client->get_stats());
+
 	// Bye-bye!
 	int ret;
 	do {
@@ -510,7 +517,7 @@ void Server::close_client(Client *client)
 	} while (ret == -1 && errno == EINTR);
 
 	if (ret == -1) {
-		perror("close");
+		log_perror("close");
 	}
 
 	clients.erase(client->sock);