jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Warn on Python < 2.7 for dictConfig

Browse Source
This commit is contained in:
Randall Leeds 2017-10-29 21:44:10 -07:00
parent a7d4491a71
commit 783c9bee3e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gunicorn/glogging.py
View File

@ -231,10 +231,22 @@ class Logger(object):
self.access_log, cfg, self.syslog_fmt, "access" self.access_log, cfg, self.syslog_fmt, "access"
) )
if dictConfig is None and cfg.logconfig_dict:
util.warn("Dictionary-based log configuration requires "
"Python 2.7 or above.")
if dictConfig and cfg.logconfig_dict: if dictConfig and cfg.logconfig_dict:
config = CONFIG_DEFAULTS.copy() config = CONFIG_DEFAULTS.copy()
config.update(cfg.logconfig_dict) config.update(cfg.logconfig_dict)
dictConfig(config) try:
dictConfig(config)
except (
AttributeError,
ImportError,
ValueError,
TypeError
) as exc:
raise RuntimeError(str(exc))
elif cfg.logconfig: elif cfg.logconfig:
if os.path.exists(cfg.logconfig): if os.path.exists(cfg.logconfig):
defaults = CONFIG_DEFAULTS.copy() defaults = CONFIG_DEFAULTS.copy()