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

review updates

Browse Source
This commit is contained in:
Raphael Deem 2017-01-29 14:01:00 -08:00 committed by Kyle Blöm
parent c808762540
commit abe5d8b53b
1 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
sanic/sanic.py
View File

@ -306,14 +306,12 @@ class Sanic:
:param protocol: Subclass of asyncio protocol class :param protocol: Subclass of asyncio protocol class
:return: Nothing :return: Nothing
""" """
server_settings = \ server_settings = self._helper(
self._helper(host=host, port=port, debug=debug, host=host, port=port, debug=debug, before_start=before_start,
before_start=before_start, after_start=after_start, after_start=after_start, before_stop=before_stop,
before_stop=before_stop, after_stop=after_stop, after_stop=after_stop, ssl=ssl, sock=sock, workers=workers,
ssl=ssl, sock=sock, workers=workers, loop=loop, loop=loop, protocol=protocol, backlog=backlog,
protocol=protocol, backlog=backlog, stop_event=stop_event, register_sys_signals=register_sys_signals)
stop_event=stop_event,
register_sys_signals=register_sys_signals)
try: try:
if workers == 1: if workers == 1:
serve(**server_settings) serve(**server_settings)
@ -338,15 +336,12 @@ class Sanic:
""" """
Asynchronous version of `run`. Asynchronous version of `run`.
""" """
server_settings = \ server_settings = self._helper(
self._helper(host=host, port=port, debug=debug, host=host, port=port, debug=debug, before_start=before_start,
before_start=before_start, after_start=after_start, after_start=after_start, before_stop=before_stop,
before_stop=before_stop, after_stop=after_stop, after_stop=after_stop, ssl=ssl, sock=sock, loop=loop,
ssl=ssl, sock=sock, loop=loop, protocol=protocol, backlog=backlog, stop_event=stop_event,
protocol=protocol, backlog=backlog, async_run=True)
stop_event=stop_event)
server_settings['run_async'] = True
# Serve # Serve
proto = "http" proto = "http"
@ -360,33 +355,14 @@ class Sanic:
before_start=None, after_start=None, before_stop=None, before_start=None, after_start=None, before_stop=None,
after_stop=None, ssl=None, sock=None, workers=1, loop=None, after_stop=None, ssl=None, sock=None, workers=1, loop=None,
protocol=HttpProtocol, backlog=100, stop_event=None, protocol=HttpProtocol, backlog=100, stop_event=None,
register_sys_signals=True): register_sys_signals=True, run_async=False):
""" """
Runs the HTTP Server and listens until keyboard interrupt or term Helper function used by `run` and `create_server`.
signal. On termination, drains connections before closing.
:param host: Address to host on
:param port: Port to host on
:param debug: Enables debug output (slows server)
:param before_start: Functions to be executed before the server starts
accepting connections
:param after_start: Functions to be executed after the server starts
accepting connections
:param before_stop: Functions to be executed when a stop signal is
received before it is respected
:param after_stop: Functions to be executed when all requests are
complete
:param ssl: SSLContext for SSL encryption of worker(s)
:param sock: Socket for the server to accept connections from
:param workers: Number of processes
received before it is respected
:param protocol: Subclass of asyncio protocol class
:return: Nothing
""" """
self.error_handler.debug = debug self.error_handler.debug = debug
self.debug = debug self.debug = debug
self.loop = loop self.loop = loop = get_event_loop()
if loop is not None: if loop is not None:
if self.debug: if self.debug:
@ -407,6 +383,7 @@ class Sanic:
'error_handler': self.error_handler, 'error_handler': self.error_handler,
'request_timeout': self.config.REQUEST_TIMEOUT, 'request_timeout': self.config.REQUEST_TIMEOUT,
'request_max_size': self.config.REQUEST_MAX_SIZE, 'request_max_size': self.config.REQUEST_MAX_SIZE,
'loop': loop,
'register_sys_signals': register_sys_signals, 'register_sys_signals': register_sys_signals,
'backlog': backlog 'backlog': backlog
} }
@ -438,9 +415,13 @@ class Sanic:
log.setLevel(logging.DEBUG) log.setLevel(logging.DEBUG)
log.debug(self.config.LOGO) log.debug(self.config.LOGO)
if run_async:
server_settings['run_async'] = True
# Serve # Serve
proto = "http" proto = "http"
if ssl is not None: if ssl is not None:
proto = "https" proto = "https"
log.info('Goin\' Fast @ {}://{}:{}'.format(proto, host, port)) log.info('Goin\' Fast @ {}://{}:{}'.format(proto, host, port))
return server_settings return server_settings