From 9e81994adc9aa4a84a4d023e4af1ff3f7dac932d Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Tue, 16 Aug 2016 16:09:59 +0200 Subject: [PATCH] Reset project auto start, auto close, auto open at project import --- gns3server/controller/import_project.py | 4 ++++ gns3server/web/web_server.py | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gns3server/controller/import_project.py b/gns3server/controller/import_project.py index a64ce782..b9a32f60 100644 --- a/gns3server/controller/import_project.py +++ b/gns3server/controller/import_project.py @@ -76,6 +76,10 @@ def import_project(controller, project_id, stream, location=None, name=None, kee topology = load_topology(os.path.join(path, "project.gns3")) topology["name"] = project_name + # To avoid unexpected behavior (project start without manual operations just after import) + topology["auto_start"] = False + topology["auto_open"] = False + topology["auto_close"] = False # Modify the compute id of the node depending of compute capacity if not keep_compute_id: diff --git a/gns3server/web/web_server.py b/gns3server/web/web_server.py index 736253d8..0d8bd5a2 100644 --- a/gns3server/web/web_server.py +++ b/gns3server/web/web_server.py @@ -232,7 +232,7 @@ class WebServer: data = json.dumps(server_info) sock.sendto(data.encode(), address) log.debug("Sent server info to {}:{} {}".format(address[0], address[1], data)) - time.sleep(1) # this is to prevent too many request to slow down the server + time.sleep(1) # this is to prevent too many request to slow down the server log.debug("UDP server discovery stopped") def run(self): @@ -305,9 +305,9 @@ class WebServer: asyncio.async(self.start_shell()) if sys.platform.startswith("linux") and server_config.getboolean("server_discovery"): - # UDP discovery is only supported on Linux - udp_server_discovery = threading.Thread(target=self._udp_server_discovery, daemon=True) - udp_server_discovery.start() + # UDP discovery is only supported on Linux + udp_server_discovery = threading.Thread(target=self._udp_server_discovery, daemon=True) + udp_server_discovery.start() try: self._loop.run_forever()