Merge pull request #1528 from hramezani/redirect_accesslog_issue_1403

Redirect accesslog issue 1403
This commit is contained in:
Benoit Chesneau 2017-08-22 21:17:59 +02:00 committed by GitHub
commit 60efb1041e
3 changed files with 41 additions and 4 deletions

View File

@ -616,6 +616,18 @@ The Access log file to write to.
``'-'`` means log to stdout.
.. _disable-redirect-access-to-syslog:
disable-redirect-access-to-syslog
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* ``--disable-redirect-access-to-syslog``
* ``False``
Disable redirect access logs to syslog.
.. versionadded:: 19.8
.. _access-log-format:
access_log_format
@ -753,6 +765,11 @@ syslog
Send *Gunicorn* logs to syslog.
.. versionchanged:: 19.8
You can now disable sending access logs by using the
:ref:`disable-redirect-access-to-syslog` setting.
.. _syslog-prefix:
syslog_prefix

View File

@ -1187,6 +1187,19 @@ class AccessLog(Setting):
``'-'`` means log to stdout.
"""
class DisableRedirectAccessToSyslog(Setting):
name = "disable_redirect_access_to_syslog"
section = "Logging"
cli = ["--disable-redirect-access-to-syslog"]
validator = validate_bool
action = 'store_true'
default = False
desc = """\
Disable redirect access logs to syslog.
.. versionadded:: 19.8
"""
class AccessLogFormat(Setting):
name = "access_log_format"
@ -1349,6 +1362,11 @@ class Syslog(Setting):
default = False
desc = """\
Send *Gunicorn* logs to syslog.
.. versionchanged:: 19.8
You can now disable sending access logs by using the
:ref:`disable-redirect-access-to-syslog` setting.
"""

View File

@ -221,9 +221,10 @@ class Logger(object):
self._set_syslog_handler(
self.error_log, cfg, self.syslog_fmt, "error"
)
self._set_syslog_handler(
self.access_log, cfg, self.syslog_fmt, "access"
)
if not cfg.disable_redirect_access_to_syslog:
self._set_syslog_handler(
self.access_log, cfg, self.syslog_fmt, "access"
)
if cfg.logconfig:
if os.path.exists(cfg.logconfig):
@ -316,7 +317,8 @@ class Logger(object):
for format details
"""
if not (self.cfg.accesslog or self.cfg.logconfig or self.cfg.syslog):
if not (self.cfg.accesslog or self.cfg.logconfig or
(self.cfg.syslog and not self.cfg.disable_access_log_redirection)):
return
# wrap atoms: