Mercurial > hg > nginx
changeset 4019:5364d2e711cc
SIGWINCH/NOACCEPT signal is disabled now in non-daemon mode.
Non-daemon mode is currently used by supervisord, daemontools and so on
or during debugging. The NOACCEPT signal is only used for online upgrade
which is not supported when nginx is run under supervisord, etc.,
so this change should not break existant setups.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 22 Aug 2011 12:34:48 +0000 |
parents | 5e544655d97b |
children | 44bf95f67065 |
files | src/os/unix/ngx_process.c |
diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/unix/ngx_process.c Mon Aug 22 10:16:49 2011 +0000 +++ b/src/os/unix/ngx_process.c Mon Aug 22 12:34:48 2011 +0000 @@ -339,8 +339,10 @@ break; case ngx_signal_value(NGX_NOACCEPT_SIGNAL): - ngx_noaccept = 1; - action = ", stop accepting connections"; + if (ngx_daemonized) { + ngx_noaccept = 1; + action = ", stop accepting connections"; + } break; case ngx_signal_value(NGX_RECONFIGURE_SIGNAL): @@ -392,6 +394,9 @@ switch (signo) { case ngx_signal_value(NGX_NOACCEPT_SIGNAL): + if (!ngx_daemonized) { + break; + } ngx_debug_quit = 1; case ngx_signal_value(NGX_SHUTDOWN_SIGNAL): ngx_quit = 1;