diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2012-12-23 15:36:52 +0000 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2012-12-23 15:36:52 +0000 |
| commit | a8ffed57510bab2a7143eb81aa3565a4bdcb8678 (patch) | |
| tree | 301479cba5e394fb9a5165f4274a037c56ba56b5 /src/core/ngx_cycle.c | |
| parent | df71cd1125390512bbd421b0218b4bbc0e1d5209 (diff) | |
| download | nginx-a8ffed57510bab2a7143eb81aa3565a4bdcb8678.tar.gz nginx-a8ffed57510bab2a7143eb81aa3565a4bdcb8678.zip | |
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..
Diffstat (limited to 'src/core/ngx_cycle.c')
| -rw-r--r-- | src/core/ngx_cycle.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index e5dad4607..dc4dc8993 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -1115,7 +1115,6 @@ ngx_test_lockfile(u_char *file, ngx_log_t *log) void ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user) { - ssize_t n, len; ngx_fd_t fd; ngx_uint_t i; ngx_list_part_t *part; @@ -1139,24 +1138,8 @@ ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user) continue; } - len = file[i].pos - file[i].buffer; - - if (file[i].buffer && len != 0) { - - 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); - } - - file[i].pos = file[i].buffer; + if (file[i].flush) { + file[i].flush(&file[i], cycle->log); } fd = ngx_open_file(file[i].name.data, NGX_FILE_APPEND, |