diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2014-08-06 00:22:36 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2014-08-06 00:22:36 +0400 |
| commit | 8f0f4c10e91a82e6f636d792c14cc608c06ca37d (patch) | |
| tree | f9cc13761b1c808448cb7c4205536f6767e275b1 /src | |
| parent | 4b5876c9228b0c7263be335e6577330988b3b00c (diff) | |
| download | nginx-8f0f4c10e91a82e6f636d792c14cc608c06ca37d.tar.gz nginx-8f0f4c10e91a82e6f636d792c14cc608c06ca37d.tar.bz2 | |
Access log: allowed logs to syslog with "if=" (ticket #596).
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_log_module.c | 17 |
1 files changed, 6 insertions, 11 deletions
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; |