diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 10:35:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 10:35:08 +0000 |
| commit | e66eb15b7be2534c9405900eb7350b538a146905 (patch) | |
| tree | 9fdde42dc4d05ce8b264225ba9c13ced6b3d8310 /src/os/unix/ngx_process.c | |
| parent | ea3aaae636eb194e3dbbc5b9d0c0a51d831e2d4c (diff) | |
| download | nginx-e66eb15b7be2534c9405900eb7350b538a146905.tar.gz nginx-e66eb15b7be2534c9405900eb7350b538a146905.tar.bz2 | |
merge r3473, r3474, r3385, r3386, r3537:
signal processing stability:
*) use sys_errlist[] in signal handler instead
of non Async-Signal-Safe strerror_r()
*) do not update time in the timer signal handler,
since localtime_r() is not Async-Signal-Safe function
*) use previously cached GMT offset value to update time from a signal handler
*) change ngx_time_update() interface since there are no notification methods
those return time
*) introduce ngx_time_sigsafe_update() to update the error log time only
*) change ngx_time_update() interface
Diffstat (limited to 'src/os/unix/ngx_process.c')
| -rw-r--r-- | src/os/unix/ngx_process.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index 21a92f178..5e230f5bb 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -315,7 +315,7 @@ ngx_signal_handler(int signo) } } - ngx_time_update(0, 0); + ngx_time_sigsafe_update(); action = ""; @@ -476,16 +476,17 @@ ngx_process_get_status(void) */ if (err == NGX_ECHILD) { - ngx_log_error(NGX_LOG_INFO, ngx_cycle->log, errno, - "waitpid() failed"); + ngx_log_error(NGX_LOG_INFO, ngx_cycle->log, 0, + "waitpid() failed (%d: %s)", + err, ngx_sigsafe_strerror(err)); return; } #endif - ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, errno, - "waitpid() failed"); - + ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, + "waitpid() failed (%d: %s)", + err, ngx_sigsafe_strerror(err)); return; } |
