Mercurial > hg > nginx
changeset 5771:c3b08217f2a2
Core: fixed default log initialization.
The ngx_log_insert() function may invalidate pointer passed to it,
so make sure to don't use it after the ngx_log_insert() call.
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Thu, 24 Jul 2014 16:25:07 +0400 |
parents | 9de5820bb3e0 |
children | d421be0d842a |
files | src/core/ngx_log.c |
diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_log.c Fri Jul 18 20:11:40 2014 +0400 +++ b/src/core/ngx_log.c Thu Jul 24 16:25:07 2014 +0400 @@ -387,20 +387,22 @@ return NGX_ERROR; } - log->log_level = NGX_LOG_ERR; - ngx_log_insert(&cycle->new_log, log); - } else { /* no error logs at all */ log = &cycle->new_log; - log->log_level = NGX_LOG_ERR; } + log->log_level = NGX_LOG_ERR; + log->file = ngx_conf_open_file(cycle, &error_log); if (log->file == NULL) { return NGX_ERROR; } + if (log != &cycle->new_log) { + ngx_log_insert(&cycle->new_log, log); + } + return NGX_OK; }