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

The logconfig_dict setting is not available on 2.6

Browse Source
This commit is contained in:
Mat Moore 2015-09-05 16:16:20 +01:00 committed by Randall Leeds
parent e6de1a07b4
commit 9d7c857521
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gunicorn/config.py
View File

@ -1316,8 +1316,8 @@ class LogConfigDict(Setting):
default = {} default = {}
desc = """\ desc = """\
The log config dictionary to use, using the standard Python logging The log config dictionary to use, using the standard Python logging
module's dictConfig format. module's dictConfig format added in python 2.7.
If specified, this takes precedence over logconfig, which uses the older If available, this takes precedence over logconfig, which uses the older
fileConfig format. fileConfig format.
""" """

9
gunicorn/glogging.py
View File

@ -8,7 +8,12 @@ import binascii
import time import time
import logging import logging
logging.Logger.manager.emittedNoHandlerWarning = 1 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 os
import socket import socket
import sys import sys
@ -226,7 +231,7 @@ class Logger(object):
self.access_log, cfg, self.syslog_fmt, "access" self.access_log, cfg, self.syslog_fmt, "access"
) )
if 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) dictConfig(config)