The logconfig_dict setting is not available on 2.6

benoitc · Sep 18, 2017 · a12b878 · a12b878
1 parent a45010f
commit a12b878
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/gunicorn/config.py b/gunicorn/config.py
@@ -1316,8 +1316,8 @@ class LogConfigDict(Setting):
     default = {}
     desc = """\
     The log config dictionary to use, using the standard Python logging
-    module's dictConfig format.
-    If specified, this takes precedence over logconfig, which uses the older
+    module's dictConfig format added in python 2.7.
+    If available, this takes precedence over logconfig, which uses the older
     fileConfig format.
     """
 

diff --git a/gunicorn/glogging.py b/gunicorn/glogging.py
@@ -8,7 +8,12 @@
 import time
 import logging
 logging.Logger.manager.emittedNoHandlerWarning = 1
-from logging.config import fileConfig, dictConfig
+from logging.config import fileConfig
+try:
+    from logging.config import dictConfig
+except ImportError:
+    # python 2.6
+    dictConfig = None
 import os
 import socket
 import sys
@@ -226,7 +231,7 @@ def setup(self, cfg):
                     self.access_log, cfg, self.syslog_fmt, "access"
                 )
 
-        if cfg.logconfig_dict:
+        if dictConfig and cfg.logconfig_dict:
             config = CONFIG_DEFAULTS.copy()
             config.update(cfg.logconfig_dict)
             dictConfig(config)