X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=46bda5b21935ff36d0aca3be838885c5e4b7b7ba;hp=02efdbbdb6c165612f2ac45219072bbfbd414982;hb=4856c49f1b63753ce86ad759ee649a1117628a8e;hpb=d1ad2cf60ca694f742e2061a596bc27c7e58f5c8

diff --git a/server.cpp b/server.cpp
index 02efdbb..46bda5b 100644
--- a/server.cpp
+++ b/server.cpp
@@ -31,7 +31,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);
 	}
 }
@@ -44,7 +44,7 @@ Server::~Server()
 	} while (ret == -1 && errno == EINTR);
 
 	if (ret == -1) {
-		perror("close(epoll_fd)");
+		log_perror("close(epoll_fd)");
 	}
 }
 
@@ -72,7 +72,7 @@ void Server::do_work()
 			continue;
 		}
 		if (nfds == -1) {
-			perror("epoll_wait");
+			log_perror("epoll_wait");
 			exit(1);
 		}
 
@@ -141,7 +141,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);
 	}
 
@@ -173,7 +173,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);
 	}
 
@@ -254,7 +254,7 @@ read_request_again:
 			return;
 		}
 		if (ret == -1) {
-			perror("read");
+			log_perror("read");
 			close_client(client);
 			return;
 		}
@@ -316,7 +316,7 @@ sending_header_or_error_again:
 
 		if (ret == -1) {
 			// Error! Postcondition #1.
-			perror("write");
+			log_perror("write");
 			close_client(client);
 			return;
 		}
@@ -387,7 +387,7 @@ sending_data_again:
 		}
 		if (ret == -1) {
 			// Error, close; postcondition #1.
-			perror("sendfile");
+			log_perror("sendfile");
 			close_client(client);
 			return;
 		}
@@ -435,7 +435,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();
@@ -455,7 +455,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);
 	}
 }
@@ -475,7 +475,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);
 	}
 }
@@ -490,7 +490,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);
 	}
 
@@ -511,7 +511,7 @@ void Server::close_client(Client *client)
 	} while (ret == -1 && errno == EINTR);
 
 	if (ret == -1) {
-		perror("close");
+		log_perror("close");
 	}
 
 	clients.erase(client->sock);