Merge branch 'master' into forwarded_allow_ips_env

This commit is contained in:
Kenneth Reitz 2016-02-11 18:42:14 -05:00
commit 845545ace2

View File

@ -539,7 +539,7 @@ class Workers(Setting):
meta = "INT" meta = "INT"
validator = validate_pos_int validator = validate_pos_int
type = int type = int
default = int(os.environ.get('WEB_CONCURRENCY', 1)) default = int(os.environ.get("WEB_CONCURRENCY", 1))
desc = """\ desc = """\
The number of worker processes for handling requests. The number of worker processes for handling requests.
@ -548,7 +548,7 @@ class Workers(Setting):
application's work load. application's work load.
By default, the value of the ``WEB_CONCURRENCY`` environment variable. By default, the value of the ``WEB_CONCURRENCY`` environment variable.
If it is not defined, the default is 1. If it is not defined, the default is ``1``.
""" """
@ -1228,7 +1228,7 @@ class EnableStdioInheritance(Setting):
default = False default = False
action = "store_true" action = "store_true"
desc = """\ desc = """\
Enable stdio inheritance Enable stdio inheritance.
Enable inheritance for stdio file descriptors in daemon mode. Enable inheritance for stdio file descriptors in daemon mode.