From: Maxim Dounin <mdounin@mdounin.ru>
Date: Tue, 5 Aug 2014 20:22:36 +0000 (+0400)
Subject: Access log: allowed logs to syslog with "if=" (ticket #596).
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=8f0f4c10e91a82e6f636d792c14cc608c06ca37d;p=nginx.git

Access log: allowed logs to syslog with "if=" (ticket #596).
---

diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index bc660cdd6..89aa4f58e 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -1254,17 +1254,6 @@ process_formats:
         return NGX_CONF_ERROR;
     }
 
-    if (log->syslog_peer != NULL) {
-        if (cf->args->nelts > 3) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "parameter \"%V\" is not supported by syslog",
-                               &value[3]);
-            return NGX_CONF_ERROR;
-        }
-
-        return NGX_CONF_OK;
-    }
-
     size = 0;
     flush = 0;
     gzip = 0;
@@ -1361,6 +1350,12 @@ process_formats:
             return NGX_CONF_ERROR;
         }
 
+        if (log->syslog_peer) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "logs to syslog cannot be buffered");
+            return NGX_CONF_ERROR;
+        }
+
         if (log->file->data) {
             buffer = log->file->data;