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

Fix async before_server_start hook bug

Browse Source
This commit is contained in:
messense 2017-03-16 17:47:01 +08:00
parent e27812bf3e
commit d1fb5bdc30
No known key found for this signature in database
GPG Key ID: BB41A8A2C716CCA9
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sanic/worker.py
View File

@ -40,8 +40,24 @@ class GunicornWorker(base.Worker):
super().init_process() super().init_process()
def run(self): def run(self):
self._runner = asyncio.ensure_future(self._run(), loop=self.loop) is_debug = self.log.loglevel == logging.DEBUG
protocol = (WebSocketProtocol if self.app.callable.websocket_enabled
else HttpProtocol)
self._server_settings = self.app.callable._helper(
host=None,
port=None,
loop=self.loop,
debug=is_debug,
protocol=protocol,
ssl=self.ssl_context,
run_async=True
)
self._server_settings.pop('sock')
trigger_events(self._server_settings.get('before_start', []),
self.loop)
self._server_settings['before_start'] = ()
self._runner = asyncio.ensure_future(self._run(), loop=self.loop)
try: try:
self.loop.run_until_complete(self._runner) self.loop.run_until_complete(self._runner)
self.app.callable.is_running = True self.app.callable.is_running = True
@ -76,19 +92,6 @@ class GunicornWorker(base.Worker):
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
async def _run(self): async def _run(self):
is_debug = self.log.loglevel == logging.DEBUG
protocol = (WebSocketProtocol if self.app.callable.websocket_enabled
else HttpProtocol)
self._server_settings = self.app.callable._helper(
host=None,
port=None,
loop=self.loop,
debug=is_debug,
protocol=protocol,
ssl=self.ssl_context,
run_async=True
)
self._server_settings.pop('sock')
for sock in self.sockets: for sock in self.sockets:
self.servers.append(await serve( self.servers.append(await serve(
sock=sock, sock=sock,