updated styling

This commit is contained in:
Cuong Tran 2018-11-20 00:08:28 +00:00
parent e98f6a039c
commit d20a26a347
2 changed files with 11 additions and 10 deletions

View File

@ -1368,8 +1368,9 @@ class LogConfigDict(Setting):
desc = """\ desc = """\
The log config dictionary to use, using the standard Python The log config dictionary to use, using the standard Python
logging module's dictionary configuration format. This option logging module's dictionary configuration format. This option
takes precedence over the :ref:`logconfig` and :ref:`logConfigJson` options, which uses the takes precedence over the :ref:`logconfig` and :ref:`logConfigJson` options,
older file configuration format and JSON respectively. which uses the older file configuration format and JSON
respectively.
Format: https://docs.python.org/3/library/logging.config.html#logging.config.dictConfig Format: https://docs.python.org/3/library/logging.config.html#logging.config.dictConfig
@ -1385,11 +1386,11 @@ class LogConfigJson(Setting):
validator = validate_string validator = validate_string
default = None default = None
desc = """\ desc = """\
The log config JSON reads config from a JSON file The log config to read config from a JSON file
Format: https://docs.python.org/3/library/logging.config.html#logging.config.dictConfig Format: https://docs.python.org/3/library/logging.config.html#logging.config.jsonConfig
.. versionadded:: 19.9 .. versionadded:: 20.0
""" """

View File

@ -246,7 +246,7 @@ class Logger(object):
config_json = json.load(open(cfg.logconfig_json)) config_json = json.load(open(cfg.logconfig_json))
config.update(config_json) config.update(config_json)
dictConfig(config) dictConfig(config)
except( except (
json.JSONDecodeError, json.JSONDecodeError,
AttributeError, AttributeError,
ImportError, ImportError,