mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 14:01:15 +02:00
Remove --controller
This add too much complexity and it can work without it. Fix https://github.com/GNS3/gns3-vm/issues/80, #645
This commit is contained in:
7 files changed
+2
-33
No files matched your search
@@ -184,9 +184,6 @@ class Route(object):
|
||||
return response
|
||||
|
||||
# API call
|
||||
if "controller" in func.__module__ and server_config.getboolean("controller", False) is False:
|
||||
raise aiohttp.web.HTTPForbidden(text="The server is not a controller")
|
||||
|
||||
request = yield from parse_request(request, input_schema, raw)
|
||||
record_file = server_config.get("record")
|
||||
if record_file:
|
||||
|
||||
@@ -102,8 +102,7 @@ class WebServer:
|
||||
yield from self._handler.finish_connections()
|
||||
self._handler = None
|
||||
|
||||
if Config.instance().get_section_config("Server").getboolean("controller"):
|
||||
yield from Controller.instance().stop()
|
||||
yield from Controller.instance().stop()
|
||||
|
||||
for module in MODULES:
|
||||
log.debug("Unloading module {}".format(module.__name__))
|
||||
@@ -306,8 +305,7 @@ class WebServer:
|
||||
self._signal_handling()
|
||||
self._exit_handling()
|
||||
|
||||
if server_config.getboolean("controller"):
|
||||
controller_start = asyncio.async(Controller.instance().start())
|
||||
controller_start = asyncio.async(Controller.instance().start())
|
||||
|
||||
if server_config.getboolean("shell"):
|
||||
asyncio.async(self.start_shell())
|
||||
|
||||
Reference in new issue
Block a user