X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=accesslog.cpp;h=81eff90e46b98312781364737d91d7e78c401ac4;hp=03aeec8a51fb284884410418c1c9eef901cfd725;hb=3fd8650ccf3da3960a946d8ac9abc305aec399ce;hpb=8d2593119a04e6b30d5c36a722a77ee32f1d454b

diff --git a/accesslog.cpp b/accesslog.cpp
index 03aeec8..81eff90 100644
--- a/accesslog.cpp
+++ b/accesslog.cpp
@@ -43,7 +43,7 @@ void AccessLogThread::do_work()
 		}
 	}
 
-	while (!should_stop) {
+	while (!should_stop()) {
 		// Empty the queue.
 		vector<ClientStats> writes;
 		{
@@ -66,26 +66,10 @@ void AccessLogThread::do_work()
 			}
 			fflush(logfp);
 		}
-		
-		// Wait until the stop_fd pipe is closed, one second has passed.
-		// or a spurious signal arrives.
-		pollfd pfd;
-		pfd.fd = stop_fd_read;
-		pfd.events = POLLIN | POLLRDHUP;
 
-		int nfds = poll(&pfd, 1, 1000);
-		if (nfds == 0 || (nfds == -1 && errno == EINTR)) {
-			continue;
-		}
-		if (nfds == 1) {
-			// Should stop.
-			break;
-		}
-		if (nfds == -1) {
-			log_perror("poll");
-			usleep(100000);
-			continue;
-		}
+		// Wait until we are being woken up, either to quit or because
+		// there is material in pending_writes.
+		wait_for_wakeup(NULL);
 	}
 
 	if (logfp != NULL) {