Mercurial > hg > nginx
diff src/core/ngx_conf_file.c @ 4985:a0599b56e748
Reopening log files code moved to a separate function.
The code refactored in a way to call custom handler that can do appropriate
cleanup work (if any), like flushing buffers, finishing compress streams,
finalizing connections to log daemon, etc..
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Sun, 23 Dec 2012 15:36:52 +0000 |
| parents | c821975c9068 |
| children | c37b9a17514d |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -945,7 +945,7 @@ ngx_conf_open_file(ngx_cycle_t *cycle, n file->name = *name; } - file->buffer = NULL; + file->flush = NULL; return file; } @@ -954,7 +954,6 @@ ngx_conf_open_file(ngx_cycle_t *cycle, n static void ngx_conf_flush_files(ngx_cycle_t *cycle) { - ssize_t n, len; ngx_uint_t i; ngx_list_part_t *part; ngx_open_file_t *file; @@ -975,23 +974,8 @@ ngx_conf_flush_files(ngx_cycle_t *cycle) i = 0; } - len = file[i].pos - file[i].buffer; - - if (file[i].buffer == NULL || len == 0) { - continue; - } - - n = ngx_write_fd(file[i].fd, file[i].buffer, len); - - if (n == -1) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - ngx_write_fd_n " to \"%s\" failed", - file[i].name.data); - - } else if (n != len) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, - ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz", - file[i].name.data, n, len); + if (file[i].flush) { + file[i].flush(&file[i], cycle->log); } } }