Merge pull request #757 from berkerpeksag/update-settings-doc

Sync settings documentation with gunicorn/config.py.
This commit is contained in:
Randall Leeds 2014-05-17 17:03:20 -07:00
commit 31bd542790
2 changed files with 17 additions and 6 deletions

View File

@ -73,6 +73,9 @@ A positive integer generally in the 2-4 x $(NUM_CORES) range. You'll
want to vary this a bit to find the best for your particular
application's work load.
By default, the value of the WEB_CONCURRENCY environment variable. If
it is not defined, the default is 1.
worker_class
~~~~~~~~~~~~
@ -215,8 +218,10 @@ debug
* ``--debug``
* ``False``
**DEPRECATED**: This no functionality was removed after v18.0. This
option is now a no-op.
Turn on debugging in the server.
**DEPRECATED**: This no functionality was removed after v18.0.
This option is now a no-op.
reload
~~~~~~
@ -609,10 +614,15 @@ e.g.
paste
~~~~~
* ``--paster STRING``
* ``--paste STRING, --paster STRING``
* ``None``
Load a paste.deploy config file.
Load a paste.deploy config file. The argument may contain a "#" symbol
followed by the name of an app section from the config file, e.g.
"production.ini#admin".
At this time, using alternate server blocks is not supported. Use the
command line arguments to control server configuration instead.
Server Hooks
------------

View File

@ -425,6 +425,7 @@ def get_default_config_file():
return None
# Please remember to run "make html" in docs/ after update "desc" attributes.
class ConfigFile(Setting):
name = "config"
section = "Config File"
@ -527,7 +528,7 @@ class WorkerClass(Setting):
* ``sync``
* ``eventlet`` - Requires eventlet >= 0.9.7
* ``gevent`` - Requires gevent >= 0.12.2 (?)
* ``gevent`` - Requires gevent >= 0.13
* ``tornado`` - Requires tornado >= 0.2
Optionally, you can provide your own worker by giving gunicorn a
@ -799,7 +800,7 @@ class Env(Setting):
$ gunicorn -b 127.0.0.1:8000 --env FOO=1 test:app
and test for the foo variable environement in your application.
and test for the foo variable environment in your application.
"""