diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 11:26:56 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 11:26:56 +0000 |
| commit | a24ed0758363a86f4d8295d301a251bee8f09dd4 (patch) | |
| tree | 33529d50b28b99ed8248a6ddc5529da5b4e812f7 | |
| parent | 8b85d78ecd81d005c542cd5da6d19f78257af2b2 (diff) | |
| download | nginx-a24ed0758363a86f4d8295d301a251bee8f09dd4.tar.gz nginx-a24ed0758363a86f4d8295d301a251bee8f09dd4.zip | |
Merging r4020:
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.
| -rw-r--r-- | src/os/unix/ngx_process.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index 605558786..ad2fc19de 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -339,8 +339,10 @@ ngx_signal_handler(int signo) 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 @@ ngx_signal_handler(int signo) 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; |