Mercurial > hg > nginx

comparison src/os/unix/ngx_process.c @ 4019:5364d2e711cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e294f37401c0
children 59b99f217c6d
comparison
equal deleted inserted replaced
4018:5e544655d97b 4019:5364d2e711cc
337 ngx_terminate = 1; 337 ngx_terminate = 1;
338 action = ", exiting"; 338 action = ", exiting";
339 break; 339 break;
340 340
341 case ngx_signal_value(NGX_NOACCEPT_SIGNAL): 341 case ngx_signal_value(NGX_NOACCEPT_SIGNAL):
342 ngx_noaccept = 1; 342 if (ngx_daemonized) {
343 action = ", stop accepting connections"; 343 ngx_noaccept = 1;
344 action = ", stop accepting connections";
345 }
344 break; 346 break;
345 347
346 case ngx_signal_value(NGX_RECONFIGURE_SIGNAL): 348 case ngx_signal_value(NGX_RECONFIGURE_SIGNAL):
347 ngx_reconfigure = 1; 349 ngx_reconfigure = 1;
348 action = ", reconfiguring"; 350 action = ", reconfiguring";
390 case NGX_PROCESS_WORKER: 392 case NGX_PROCESS_WORKER:
391 case NGX_PROCESS_HELPER: 393 case NGX_PROCESS_HELPER:
392 switch (signo) { 394 switch (signo) {
393 395
394 case ngx_signal_value(NGX_NOACCEPT_SIGNAL): 396 case ngx_signal_value(NGX_NOACCEPT_SIGNAL):
397 if (!ngx_daemonized) {
398 break;
399 }
395 ngx_debug_quit = 1; 400 ngx_debug_quit = 1;
396 case ngx_signal_value(NGX_SHUTDOWN_SIGNAL): 401 case ngx_signal_value(NGX_SHUTDOWN_SIGNAL):
397 ngx_quit = 1; 402 ngx_quit = 1;
398 action = ", shutting down"; 403 action = ", shutting down";
399 break; 404 break;