Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

NO_KEEP_ALIVE -> KEEP_ALIVE

Browse Source
This commit is contained in:
Raphael Deem 2017-04-16 22:43:49 -07:00
parent 6f098b3d21
commit 81b6d988ec
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sanic/config.md
View File

@ -83,4 +83,4 @@ Out of the box there are just a few predefined values which can be overwritten w
| ----------------- | --------- | --------------------------------- |
| REQUEST_MAX_SIZE | 100000000 | How big a request may be (bytes) |
| REQUEST_TIMEOUT | 60 | How long a request can take (sec) |
| NO_KEEP_ALIVE | False | Disable keep-alive |
| KEEP_ALIVE | True | Disables keep-alive when False |

2
sanic/app.py
View File

@ -679,7 +679,7 @@ class Sanic:
'error_handler': self.error_handler,
'request_timeout': self.config.REQUEST_TIMEOUT,
'request_max_size': self.config.REQUEST_MAX_SIZE,
'no_keep_alive': self.config.NO_KEEP_ALIVE,
'keep_alive': self.config.KEEP_ALIVE,
'loop': loop,
'register_sys_signals': register_sys_signals,
'backlog': backlog

4
sanic/config.py
View File

@ -6,7 +6,7 @@ SANIC_PREFIX = 'SANIC_'
class Config(dict):
def __init__(self, defaults=None, load_env=True, no_keep_alive=False):
def __init__(self, defaults=None, load_env=True, keep_alive=True):
super().__init__(defaults or {})
self.LOGO = """
▄▄▄▄▄
@ -31,7 +31,7 @@ class Config(dict):
"""
self.REQUEST_MAX_SIZE = 100000000 # 100 megababies
self.REQUEST_TIMEOUT = 60 # 60 seconds
self.NO_KEEP_ALIVE = no_keep_alive
self.KEEP_ALIVE = keep_alive
if load_env:
self.load_environment_vars()

10
sanic/server.py
View File

@ -71,7 +71,7 @@ class HttpProtocol(asyncio.Protocol):
def __init__(self, *, loop, request_handler, error_handler,
signal=Signal(), connections=set(), request_timeout=60,
request_max_size=None, request_class=None,
no_keep_alive=False):
keep_alive=True):
self.loop = loop
self.transport = None
self.request = None
@ -89,11 +89,11 @@ class HttpProtocol(asyncio.Protocol):
self._timeout_handler = None
self._last_request_time = None
self._request_handler_task = None
self._no_keep_alive = no_keep_alive
self._keep_alive = keep_alive
@property
def keep_alive(self):
return (not self._no_keep_alive
return (self._keep_alive
and not self.signal.stopped
and self.parser.should_keep_alive())
@ -326,7 +326,7 @@ def serve(host, port, request_handler, error_handler, before_start=None,
request_timeout=60, ssl=None, sock=None, request_max_size=None,
reuse_port=False, loop=None, protocol=HttpProtocol, backlog=100,
register_sys_signals=True, run_async=False, connections=None,
signal=Signal(), request_class=None, no_keep_alive=False):
signal=Signal(), request_class=None, keep_alive=True):
"""Start asynchronous HTTP Server on an individual process.
:param host: Address to host on
@ -374,7 +374,7 @@ def serve(host, port, request_handler, error_handler, before_start=None,
request_timeout=request_timeout,
request_max_size=request_max_size,
request_class=request_class,
no_keep_alive=no_keep_alive,
keep_alive=keep_alive,
)
server_coroutine = loop.create_server(