Mercurial > hg > nginx

changeset 4327:73d37e1ccb91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Improved error message when parsing of the "buffer" parameter of the "access_log" directive fails. - Added a warning if "log_format" is used in contexts other than "http".
author Ruslan Ermilov <ru@nginx.com>
date Tue, 06 Dec 2011 21:07:10 +0000
parents 7423800ef437
children d15a00e6d9e6
files src/http/modules/ngx_http_log_module.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -971,7 +971,7 @@ buffer:
 
         if (buf == NGX_ERROR) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid parameter \"%V\"", &value[3]);
+                               "invalid buffer value \"%V\"", &name);
             return NGX_CONF_ERROR;
         }
 
@@ -1004,6 +1004,12 @@ 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;