aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2015-05-06 17:04:00 +0300
committerRuslan Ermilov <ru@nginx.com>2015-05-06 17:04:00 +0300
commit91df4f0746ae61087fb2cb18b3a1de091c4bf8ef (patch)
treed51df0024926426e3adb35168b3a9f116aa0d099
parent1a4ea1acc717221b873f0cfdd0649dbb94595ec2 (diff)
downloadnginx-91df4f0746ae61087fb2cb18b3a1de091c4bf8ef.tar.gz
nginx-91df4f0746ae61087fb2cb18b3a1de091c4bf8ef.zip
Events: made a failure to create a notification channel non-fatal.
This may happen if eventfd() returns ENOSYS, notably seen on CentOS 5.4. Such a failure will now just disable the notification mechanism and let the callers cope with it, instead of failing to start worker processes. If thread pools are not configured, this can safely be ignored.
-rw-r--r--src/event/modules/ngx_epoll_module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index 3458b209a..d7f915de9 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -329,7 +329,7 @@ ngx_epoll_init(ngx_cycle_t *cycle, ngx_msec_t timer)
#if (NGX_HAVE_EVENTFD)
if (ngx_epoll_notify_init(cycle->log) != NGX_OK) {
- return NGX_ERROR;
+ ngx_epoll_module_ctx.actions.notify = NULL;
}
#endif