[nginx] Fixed an error log message about epoll_wait() timeout.

Valentin Bartenev vbart at nginx.com
Mon May 16 13:23:40 UTC 2016


details:   http://hg.nginx.org/nginx/rev/3ad1064a3aae
branches:  
changeset: 6537:3ad1064a3aae
user:      Valentin Bartenev <vbart at nginx.com>
date:      Mon May 16 16:22:34 2016 +0300
description:
Fixed an error log message about epoll_wait() timeout.

The errno value is unset in case of epoll_wait() timeout.

diffstat:

 src/event/modules/ngx_epoll_module.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r f7849bfb6d21 -r 3ad1064a3aae src/event/modules/ngx_epoll_module.c
--- a/src/event/modules/ngx_epoll_module.c	Fri May 13 17:19:23 2016 +0300
+++ b/src/event/modules/ngx_epoll_module.c	Mon May 16 16:22:34 2016 +0300
@@ -1000,8 +1000,8 @@ ngx_epoll_module_init(ngx_cycle_t *cycle
         ngx_use_epoll_rdhup = ee.events & EPOLLRDHUP;
 
     } else {
-        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                      "epoll_wait() timedout");
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, NGX_ETIMEDOUT,
+                      "epoll_wait() timed out");
     }
 
     ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0,



More information about the nginx-devel mailing list