Mercurial > hg > nginx-quic
comparison src/os/unix/ngx_process_cycle.c @ 6480:f01ab2dbcfdc
Fixed logging.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Thu, 31 Mar 2016 02:33:57 +0300 |
parents | 7296b38f6416 |
children | 1a1d55834b5c |
comparison
equal
deleted
inserted
replaced
6479:dc92298b1852 | 6480:f01ab2dbcfdc |
---|---|
143 delay *= 2; | 143 delay *= 2; |
144 ngx_sigalrm = 0; | 144 ngx_sigalrm = 0; |
145 } | 145 } |
146 | 146 |
147 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, | 147 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, |
148 "termination cycle: %d", delay); | 148 "termination cycle: %M", delay); |
149 | 149 |
150 itv.it_interval.tv_sec = 0; | 150 itv.it_interval.tv_sec = 0; |
151 itv.it_interval.tv_usec = 0; | 151 itv.it_interval.tv_usec = 0; |
152 itv.it_value.tv_sec = delay / 1000; | 152 itv.it_value.tv_sec = delay / 1000; |
153 itv.it_value.tv_usec = (delay % 1000 ) * 1000; | 153 itv.it_value.tv_usec = (delay % 1000 ) * 1000; |
436 { | 436 { |
437 continue; | 437 continue; |
438 } | 438 } |
439 | 439 |
440 ngx_log_debug6(NGX_LOG_DEBUG_CORE, cycle->log, 0, | 440 ngx_log_debug6(NGX_LOG_DEBUG_CORE, cycle->log, 0, |
441 "pass channel s:%d pid:%P fd:%d to s:%i pid:%P fd:%d", | 441 "pass channel s:%i pid:%P fd:%d to s:%i pid:%P fd:%d", |
442 ch->slot, ch->pid, ch->fd, | 442 ch->slot, ch->pid, ch->fd, |
443 i, ngx_processes[i].pid, | 443 i, ngx_processes[i].pid, |
444 ngx_processes[i].channel[0]); | 444 ngx_processes[i].channel[0]); |
445 | 445 |
446 /* TODO: NGX_AGAIN */ | 446 /* TODO: NGX_AGAIN */ |
490 | 490 |
491 | 491 |
492 for (i = 0; i < ngx_last_process; i++) { | 492 for (i = 0; i < ngx_last_process; i++) { |
493 | 493 |
494 ngx_log_debug7(NGX_LOG_DEBUG_EVENT, cycle->log, 0, | 494 ngx_log_debug7(NGX_LOG_DEBUG_EVENT, cycle->log, 0, |
495 "child: %d %P e:%d t:%d d:%d r:%d j:%d", | 495 "child: %i %P e:%d t:%d d:%d r:%d j:%d", |
496 i, | 496 i, |
497 ngx_processes[i].pid, | 497 ngx_processes[i].pid, |
498 ngx_processes[i].exiting, | 498 ngx_processes[i].exiting, |
499 ngx_processes[i].exited, | 499 ngx_processes[i].exited, |
500 ngx_processes[i].detached, | 500 ngx_processes[i].detached, |
568 | 568 |
569 live = 0; | 569 live = 0; |
570 for (i = 0; i < ngx_last_process; i++) { | 570 for (i = 0; i < ngx_last_process; i++) { |
571 | 571 |
572 ngx_log_debug7(NGX_LOG_DEBUG_EVENT, cycle->log, 0, | 572 ngx_log_debug7(NGX_LOG_DEBUG_EVENT, cycle->log, 0, |
573 "child: %d %P e:%d t:%d d:%d r:%d j:%d", | 573 "child: %i %P e:%d t:%d d:%d r:%d j:%d", |
574 i, | 574 i, |
575 ngx_processes[i].pid, | 575 ngx_processes[i].pid, |
576 ngx_processes[i].exiting, | 576 ngx_processes[i].exiting, |
577 ngx_processes[i].exited, | 577 ngx_processes[i].exited, |
578 ngx_processes[i].detached, | 578 ngx_processes[i].detached, |
1045 if (n == NGX_AGAIN) { | 1045 if (n == NGX_AGAIN) { |
1046 return; | 1046 return; |
1047 } | 1047 } |
1048 | 1048 |
1049 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, | 1049 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, |
1050 "channel command: %d", ch.command); | 1050 "channel command: %ui", ch.command); |
1051 | 1051 |
1052 switch (ch.command) { | 1052 switch (ch.command) { |
1053 | 1053 |
1054 case NGX_CMD_QUIT: | 1054 case NGX_CMD_QUIT: |
1055 ngx_quit = 1; | 1055 ngx_quit = 1; |