NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-18 07:23:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes aiohttp.errors.ClientDisconnectedError errors when SIGINT is received.

Browse Source
This commit is contained in:
Jeremy 2015-02-22 12:36:44 -07:00
parent 565a7b35a6
commit da11343647
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gns3server/server.py
View File

@ -52,10 +52,10 @@ class Server:
self._port_manager = PortManager(host) self._port_manager = PortManager(host)
@asyncio.coroutine @asyncio.coroutine
def _run_application(self, app, ssl_context=None): def _run_application(self, handler, ssl_context=None):
try: try:
server = yield from self._loop.create_server(app.make_handler(handler=RequestHandler), self._host, self._port, ssl=ssl_context) server = yield from self._loop.create_server(handler, self._host, self._port, ssl=ssl_context)
except OSError as e: except OSError as e:
log.critical("Could not start the server: {}".format(e)) log.critical("Could not start the server: {}".format(e))
self._loop.stop() self._loop.stop()
@ -74,11 +74,12 @@ class Server:
yield from m.unload() yield from m.unload()
self._loop.stop() self._loop.stop()
def _signal_handling(self): def _signal_handling(self, handler):
@asyncio.coroutine @asyncio.coroutine
def signal_handler(signame): def signal_handler(signame):
log.warning("Server has got signal {}, exiting...".format(signame)) log.warning("Server has got signal {}, exiting...".format(signame))
yield from handler.finish_connections()
yield from self._stop_application() yield from self._stop_application()
signals = ["SIGTERM", "SIGINT"] signals = ["SIGTERM", "SIGINT"]
@ -177,8 +178,9 @@ class Server:
m.port_manager = self._port_manager m.port_manager = self._port_manager
log.info("Starting server on {}:{}".format(self._host, self._port)) log.info("Starting server on {}:{}".format(self._host, self._port))
self._loop.run_until_complete(self._run_application(app, ssl_context)) handler = app.make_handler(handler=RequestHandler)
self._signal_handling() self._loop.run_until_complete(self._run_application(handler, ssl_context))
self._signal_handling(handler)
if server_config.getboolean("live"): if server_config.getboolean("live"):
log.info("Code live reload is enabled, watching for file changes") log.info("Code live reload is enabled, watching for file changes")