jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-07-02 18:51:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

updated styling

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gunicorn/config.py
View File

@ -627,11 +627,11 @@ class WorkerClass(Setting):
A string referring to one of the following bundled classes: A string referring to one of the following bundled classes:
* ``sync`` * ``sync``
* ``eventlet`` - Requires eventlet >= 0.9.7 (or install it via * ``eventlet`` - Requires eventlet >= 0.9.7 (or install it via
``pip install gunicorn[eventlet]``) ``pip install gunicorn[eventlet]``)
* ``gevent`` - Requires gevent >= 0.13 (or install it via * ``gevent`` - Requires gevent >= 0.13 (or install it via
``pip install gunicorn[gevent]``) ``pip install gunicorn[gevent]``)
* ``tornado`` - Requires tornado >= 0.2 (or install it via * ``tornado`` - Requires tornado >= 0.2 (or install it via
``pip install gunicorn[tornado]``) ``pip install gunicorn[tornado]``)
* ``gthread`` - Python 2 requires the futures package to be installed * ``gthread`` - Python 2 requires the futures package to be installed
(or install it via ``pip install gunicorn[gthread]``) (or install it via ``pip install gunicorn[gthread]``)
@ -668,7 +668,7 @@ class WorkerThreads(Setting):
If it is not defined, the default is ``1``. If it is not defined, the default is ``1``.
This setting only affects the Gthread worker type. This setting only affects the Gthread worker type.
.. note:: .. note::
If you try to use the ``sync`` worker type and set the ``threads`` If you try to use the ``sync`` worker type and set the ``threads``
setting to more than 1, the ``gthread`` worker type will be used setting to more than 1, the ``gthread`` worker type will be used
@ -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
""" """

2
gunicorn/glogging.py
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,