From 764d9d439a75f758a8ebe7b728e9d3323596c92e Mon Sep 17 00:00:00 2001 From: Malthe Borch Date: Fri, 24 Jan 2014 17:41:05 +0000 Subject: [PATCH] Also include access log in the syslog handler. --- THANKS | 1 + docs/source/2014-news.rst | 8 ++++++++ docs/source/news.rst | 6 ++++++ gunicorn/glogging.py | 11 ++++++++--- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 docs/source/2014-news.rst diff --git a/THANKS b/THANKS index f84f6dd4..fb3a91ab 100644 --- a/THANKS +++ b/THANKS @@ -70,3 +70,4 @@ kracekumar keakon Xie Shi Steven Cummings +Malthe Borch diff --git a/docs/source/2014-news.rst b/docs/source/2014-news.rst new file mode 100644 index 00000000..6b3843af --- /dev/null +++ b/docs/source/2014-news.rst @@ -0,0 +1,8 @@ +Changelog - 2014 +================ + +18.2 / unreleased +----------------- + +- new: logging to syslog now includes the access log. + diff --git a/docs/source/news.rst b/docs/source/news.rst index 646a5e2c..6cb61bc2 100644 --- a/docs/source/news.rst +++ b/docs/source/news.rst @@ -1,6 +1,12 @@ Changelog ========= +18.2 / unreleased +----------------- + +- new: logging to syslog now includes the access log. + + 18.0 / 2013-08-26 ----------------- diff --git a/gunicorn/glogging.py b/gunicorn/glogging.py index d39e45e5..bc71af97 100644 --- a/gunicorn/glogging.py +++ b/gunicorn/glogging.py @@ -190,7 +190,12 @@ class Logger(object): # set syslog handler if cfg.syslog: - self._set_syslog_handler(self.error_log, cfg, self.syslog_fmt) + self._set_syslog_handler( + self.error_log, cfg, self.syslog_fmt, "errors" + ) + self._set_syslog_handler( + self.access_log, cfg, self.syslog_fmt, "access" + ) if cfg.logconfig: if os.path.exists(cfg.logconfig): @@ -328,14 +333,14 @@ class Logger(object): h._gunicorn = True log.addHandler(h) - def _set_syslog_handler(self, log, cfg, fmt): + def _set_syslog_handler(self, log, cfg, fmt, name): # setup format if not cfg.syslog_prefix: prefix = cfg.proc_name.replace(":", ".") else: prefix = cfg.syslog_prefix - prefix = "gunicorn.%s" % prefix + prefix = "gunicorn.%s.%s" % (prefix, name) # set format fmt = logging.Formatter(r"%s: %s" % (prefix, fmt))