Fix this.signal.stopped is True #639

This commit is contained in:
38elements 2017-04-19 11:19:01 +09:00
parent 7e9b65feca
commit df914a92e4

View File

@ -16,7 +16,7 @@ from sanic.handlers import ErrorHandler
from sanic.log import log
from sanic.response import HTTPResponse, StreamingHTTPResponse
from sanic.router import Router
from sanic.server import serve, serve_multiple, HttpProtocol
from sanic.server import serve, serve_multiple, HttpProtocol, Signal
from sanic.static import register as static_register
from sanic.testing import SanicTestClient
from sanic.views import CompositionView
@ -548,12 +548,13 @@ class Sanic:
warnings.simplefilter('default')
warnings.warn("stop_event will be removed from future versions.",
DeprecationWarning)
signal = Signal()
server_settings = self._helper(
host=host, port=port, debug=debug, before_start=before_start,
after_start=after_start, before_stop=before_stop,
after_stop=after_stop, ssl=ssl, sock=sock, workers=workers,
loop=loop, protocol=protocol, backlog=backlog,
register_sys_signals=register_sys_signals)
register_sys_signals=register_sys_signals, signal=signal)
try:
self.is_running = True
@ -594,12 +595,13 @@ class Sanic:
warnings.simplefilter('default')
warnings.warn("stop_event will be removed from future versions.",
DeprecationWarning)
signal = Signal()
server_settings = self._helper(
host=host, port=port, debug=debug, before_start=before_start,
after_start=after_start, before_stop=before_stop,
after_stop=after_stop, ssl=ssl, sock=sock,
loop=loop or get_event_loop(), protocol=protocol,
backlog=backlog, run_async=True)
backlog=backlog, run_async=True, signal=signal)
return await serve(**server_settings)
@ -629,7 +631,7 @@ class Sanic:
before_start=None, after_start=None, before_stop=None,
after_stop=None, ssl=None, sock=None, workers=1, loop=None,
protocol=HttpProtocol, backlog=100, stop_event=None,
register_sys_signals=True, run_async=False):
register_sys_signals=True, run_async=False, signal=None):
"""Helper function used by `run` and `create_server`."""
if isinstance(ssl, dict):
@ -674,6 +676,7 @@ class Sanic:
'port': port,
'sock': sock,
'ssl': ssl,
'signal': signal,
'debug': debug,
'request_handler': self.handle_request,
'error_handler': self.error_handler,