Merge pull request #685 from malthe/include-access-log-in-syslog-handler

Also include access log in the syslog handler.

THANKS

@@ -70,3 +70,4 @@ kracekumar <kracethekingmaker@gmail.com>
 keakon <keakon@gmail.com>
 Xie Shi <xieshi@douban.com>
 Steven Cummings <estebistec@gmail.com>
+Malthe Borch <mborch@gmail.com>

docs/source/2014-news.rst

@@ -0,0 +1,8 @@
+Changelog - 2014
+================
+
+18.2 / unreleased
+-----------------
+
+- new: logging to syslog now includes the access log.
+

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
 -----------------
 

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, "error"
+            )
+            self._set_syslog_handler(
+                self.access_log, cfg, self.syslog_fmt, "access"
+            )
 
         if cfg.logconfig:
             if os.path.exists(cfg.logconfig):
@@ -325,14 +330,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))