# HG changeset patch # User Sergey Kandaurov # Date 1417434696 -10800 # Node ID ac2a8e4d8f01e4dee0f8c630a5027e7e2b123279 # Parent 08bfc7188a41d13b47239fb393188b6f3dca16f2 Access log: restricted "log_format" to "http" level. Specifying the "log_format" directive on levels other than "http" is deprecated since 73d37e1ccb91 (1.1.11). diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c --- a/src/http/modules/ngx_http_log_module.c +++ b/src/http/modules/ngx_http_log_module.c @@ -152,7 +152,7 @@ static ngx_int_t ngx_http_log_init(ngx_c static ngx_command_t ngx_http_log_commands[] = { { ngx_string("log_format"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE, + NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, ngx_http_log_set_format, NGX_HTTP_MAIN_CONF_OFFSET, 0, @@ -1448,12 +1448,6 @@ ngx_http_log_set_format(ngx_conf_t *cf, ngx_uint_t i; ngx_http_log_fmt_t *fmt; - if (cf->cmd_type != NGX_HTTP_MAIN_CONF) { - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, - "the \"log_format\" directive may be used " - "only on \"http\" level"); - } - value = cf->args->elts; fmt = lmcf->formats.elts;