add graceful_shutdown_timeout to gunicorn worker

This commit is contained in:
Yun Xu 2017-06-25 00:51:14 -07:00
parent 5c19eb34bf
commit d812affef0
4 changed files with 28 additions and 2 deletions

View File

@ -701,7 +701,8 @@ class Sanic:
'backlog': backlog, 'backlog': backlog,
'has_log': has_log, 'has_log': has_log,
'websocket_max_size': self.config.WEBSOCKET_MAX_SIZE, 'websocket_max_size': self.config.WEBSOCKET_MAX_SIZE,
'websocket_max_queue': self.config.WEBSOCKET_MAX_QUEUE 'websocket_max_queue': self.config.WEBSOCKET_MAX_QUEUE,
'graceful_shutdown_timeout': self.config.GRACEFUL_SHUTDOWN_TIMEOUT
} }
# -------------------------------------------- # # -------------------------------------------- #

View File

@ -127,6 +127,7 @@ class Config(dict):
self.KEEP_ALIVE = keep_alive self.KEEP_ALIVE = keep_alive
self.WEBSOCKET_MAX_SIZE = 2 ** 20 # 1 megabytes self.WEBSOCKET_MAX_SIZE = 2 ** 20 # 1 megabytes
self.WEBSOCKET_MAX_QUEUE = 32 self.WEBSOCKET_MAX_QUEUE = 32
self.GRACEFUL_SHUTDOWN_TIMEOUT = 15.0 # 15 sec
if load_env: if load_env:
self.load_environment_vars() self.load_environment_vars()

View File

@ -363,6 +363,14 @@ class HttpProtocol(asyncio.Protocol):
return True return True
return False return False
def close(self):
"""
Force close the connection.
"""
if self.transport is not None:
self.transport.close()
self.transport = None
def update_current_time(loop): def update_current_time(loop):
"""Cache the current time, since it is needed at the end of every """Cache the current time, since it is needed at the end of every

View File

@ -91,8 +91,24 @@ class GunicornWorker(base.Worker):
for conn in self.connections: for conn in self.connections:
conn.close_if_idle() conn.close_if_idle()
while self.connections: # gracefully shutdown timeout
start_shutdown = 0
graceful_shutdown_timeout = self.cfg.graceful_timeout
while self.connections and (start_shutdown < graceful_shutdown_timeout):
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
start_shutdown = start_shutdown + 0.1
# Force close non-idle connection after waiting for
# graceful_shutdown_timeout
coros = []
for conn in self.connections:
if hasattr(conn, "websocket") and conn.websocket:
coros.append(conn.websocket.close_connection(force=True))
else:
conn.close()
_shutdown = asyncio.gather(*coros, loop=self.loop)
await _shutdown
async def _run(self): async def _run(self):
for sock in self.sockets: for sock in self.sockets: