Mercurial > hg > nginx
comparison src/core/nginx.c @ 2923:d9c46f98b09f
a signaller process should stop configuration processing just after
it is able to get pid file, this allows to not open log files, etc.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 06 Jun 2009 12:41:31 +0000 |
parents | caa4f7dcf1e3 |
children | adc4fc0c3cc3 08570d26c7c5 |
comparison
equal
deleted
inserted
replaced
2922:f0604d0b28a6 | 2923:d9c46f98b09f |
---|---|
328 ngx_log_stderr(0, "configuration file %s test is successful", | 328 ngx_log_stderr(0, "configuration file %s test is successful", |
329 cycle->conf_file.data); | 329 cycle->conf_file.data); |
330 return 0; | 330 return 0; |
331 } | 331 } |
332 | 332 |
333 if (ngx_signal) { | |
334 return ngx_signal_process(cycle, ngx_signal); | |
335 } | |
336 | |
333 ngx_os_status(cycle->log); | 337 ngx_os_status(cycle->log); |
334 | 338 |
335 ngx_cycle = cycle; | 339 ngx_cycle = cycle; |
336 | 340 |
337 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); | 341 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); |
338 | 342 |
339 if (ccf->master && ngx_process == NGX_PROCESS_SINGLE) { | 343 if (ccf->master && ngx_process == NGX_PROCESS_SINGLE) { |
340 ngx_process = NGX_PROCESS_MASTER; | 344 ngx_process = NGX_PROCESS_MASTER; |
341 } | |
342 | |
343 if (ngx_signal) { | |
344 return ngx_signal_process(cycle, ngx_signal); | |
345 } | 345 } |
346 | 346 |
347 #if !(NGX_WIN32) | 347 #if !(NGX_WIN32) |
348 | 348 |
349 if (ngx_init_signals(cycle->log) != NGX_OK) { | 349 if (ngx_init_signals(cycle->log) != NGX_OK) { |