IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-18 21:23:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Access log: removed dead ev->timedout check in flush timer handler.

Browse Source 
The ev->timedout flag is set on first timer expiration, and never reset
after it.  Due to this the code to stop the timer when the timer was
canceled never worked (except in a very specific time frame immediately
after start), and the timer was always armed again.  This essentially
resulted in a buffer flush at the end of an event loop iteration.

This behaviour actually seems to be better than just stopping the flush
timer for the whole shutdown, so it is preserved as is instead of fixing
the code to actually remove the timer.  It will be further improved by
upcoming changes to preserve cancelable timers if there are other timers
blocking shutdown.
This commit is contained in:
Maxim Dounin 2017-03-07 18:51:12 +03:00
parent fca26c2e53
commit c1d8318d31
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/http/modules/ngx_http_log_module.c
View File

@ -748,23 +748,10 @@ ngx_http_log_flush(ngx_open_file_t *file, ngx_log_t *log)
static void
ngx_http_log_flush_handler(ngx_event_t *ev)
{
ngx_open_file_t *file;
ngx_http_log_buf_t *buffer;
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0,
"http log buffer flush handler");
if (ev->timedout) {
ngx_http_log_flush(ev->data, ev->log);
return;
}
/* cancel the flush timer for graceful shutdown */
file = ev->data;
buffer = file->data;
buffer->event = NULL;
ngx_http_log_flush(ev->data, ev->log);
}

15
src/stream/ngx_stream_log_module.c
View File

@ -641,23 +641,10 @@ ngx_stream_log_flush(ngx_open_file_t *file, ngx_log_t *log)
static void
ngx_stream_log_flush_handler(ngx_event_t *ev)
{
ngx_open_file_t *file;
ngx_stream_log_buf_t *buffer;
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0,
"stream log buffer flush handler");
if (ev->timedout) {
ngx_stream_log_flush(ev->data, ev->log);
return;
}
/* cancel the flush timer for graceful shutdown */
file = ev->data;
buffer = file->data;
buffer->event = NULL;
ngx_stream_log_flush(ev->data, ev->log);
}