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.
This commit is contained in:
parent
1312192925
commit
1296199fde
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue