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).
This commit is contained in:
Sergey Kandaurov 2014-12-01 14:51:36 +03:00
parent ece388033a
commit 778cc4b42e

View File

@ -152,7 +152,7 @@ static ngx_int_t ngx_http_log_init(ngx_conf_t *cf);
static ngx_command_t ngx_http_log_commands[] = { static ngx_command_t ngx_http_log_commands[] = {
{ ngx_string("log_format"), { 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_log_set_format,
NGX_HTTP_MAIN_CONF_OFFSET, NGX_HTTP_MAIN_CONF_OFFSET,
0, 0,
@ -1448,12 +1448,6 @@ ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_uint_t i; ngx_uint_t i;
ngx_http_log_fmt_t *fmt; 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; value = cf->args->elts;
fmt = lmcf->formats.elts; fmt = lmcf->formats.elts;