mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 06:46:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix "access_log off"

Browse Source
This commit is contained in:
Igor Sysoev 2007-01-24 09:15:25 +00:00
parent 64304df431
commit 3a58cc90b5
1 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ ngx_module_t ngx_http_log_module = {
}; };
static ngx_str_t http_access_log = ngx_string(NGX_HTTP_LOG_PATH); static ngx_str_t ngx_http_access_log = ngx_string(NGX_HTTP_LOG_PATH);
static ngx_str_t ngx_http_combined_fmt = static ngx_str_t ngx_http_combined_fmt =
@ -554,49 +554,41 @@ ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_log_fmt_t *fmt; ngx_http_log_fmt_t *fmt;
ngx_http_log_main_conf_t *lmcf; ngx_http_log_main_conf_t *lmcf;
if (conf->logs == NULL) { if (conf->logs || conf->off) {
return NGX_CONF_OK;
if (conf->off) {
return NGX_CONF_OK;
}
if (prev->logs) {
conf->logs = prev->logs;
} else {
if (prev->off) {
conf->off = prev->off;
return NGX_CONF_OK;
}
conf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t));
if (conf->logs == NULL) {
return NGX_CONF_ERROR;
}
log = ngx_array_push(conf->logs);
if (log == NULL) {
return NGX_CONF_ERROR;
}
log->file = ngx_conf_open_file(cf->cycle, &http_access_log);
if (log->file == NULL) {
return NGX_CONF_ERROR;
}
log->disk_full_time = 0;
log->error_log_time = 0;
lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module);
fmt = lmcf->formats.elts;
/* the default "combined" format */
log->ops = fmt[0].ops;
lmcf->combined_used = 1;
}
} }
*conf = *prev;
if (conf->logs || conf->off) {
return NGX_CONF_OK;
}
conf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t));
if (conf->logs == NULL) {
return NGX_CONF_ERROR;
}
log = ngx_array_push(conf->logs);
if (log == NULL) {
return NGX_CONF_ERROR;
}
log->file = ngx_conf_open_file(cf->cycle, &ngx_http_access_log);
if (log->file == NULL) {
return NGX_CONF_ERROR;
}
log->disk_full_time = 0;
log->error_log_time = 0;
lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module);
fmt = lmcf->formats.elts;
/* the default "combined" format */
log->ops = fmt[0].ops;
lmcf->combined_used = 1;
return NGX_CONF_OK; return NGX_CONF_OK;
} }