From 0fde6e501db76160ec3fcb70b60847f00dde0107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 20 Mar 2018 11:22:29 +0200 Subject: [PATCH] Don't treat EINTR as an error When the epoll_wait call returns with an error and errno is set to EINTR, no warning should be logged as this is correct behavior. --- server/core/worker.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/core/worker.cc b/server/core/worker.cc index 97fe7cab4..4a97ee8e8 100644 --- a/server/core/worker.cc +++ b/server/core/worker.cc @@ -1185,7 +1185,7 @@ void Worker::poll_waitevents() nfds = epoll_wait(m_epoll_fd, events, MAX_EVENTS, timeout); m_load.about_to_work(); - if (nfds == -1) + if (nfds == -1 && errno != EINTR) { int eno = errno; errno = 0;