ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-20 16:20:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0' into 2.0

Browse Source 
Conflicts:
	gns3server/web/web_server.py
This commit is contained in:
grossmj
2016-06-16 11:19:03 -06:00
parent 32907ccac3 c66ef9d218
commit da58a65075
12 changed files with 69 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/web/web_server.py
View File

@ -59,6 +59,7 @@ class WebServer:
self._handler = None
self._start_time = time.time()
self._port_manager = PortManager(host)
self._running = False
@staticmethod
def instance(host=None, port=None):
@ -298,7 +299,7 @@ class WebServer:
if server_config.getboolean("shell"):
asyncio.async(self.start_shell())
if sys.platform.startswith("linux"):
if sys.platform.startswith("linux") and server_config.getboolean("udp_discovery"):
# UDP discovery is only supported on Linux
udp_server_discovery = threading.Thread(target=self._udp_server_discovery, daemon=True)
udp_server_discovery.start()