arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-02-15 09:32:00 +00:00
Code Issues Releases Wiki Activity

Change option from udp_discovery to server_discovery.

Browse Source
This commit is contained in:
grossmj 2016-06-16 11:27:10 -06:00
parent da58a65075
commit a289c9c685
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/run.py
View File

@ -102,7 +102,7 @@ def parse_arguments(argv):
parser.add_argument("--log", help="send output to logfile instead of console") parser.add_argument("--log", help="send output to logfile instead of console")
parser.add_argument("--daemon", action="store_true", help="start as a daemon") parser.add_argument("--daemon", action="store_true", help="start as a daemon")
parser.add_argument("--pid", help="store process pid") parser.add_argument("--pid", help="store process pid")
parser.add_argument("--udpdiscovery", action="store_true", help="allow the server to be discover on the network") parser.add_argument("--serverdiscovery", action="store_true", help="allows the server to be discovered on the network via broadcast or multicast on 239.42.42.1")
args = parser.parse_args(argv) args = parser.parse_args(argv)
if args.config: if args.config:
@ -122,7 +122,7 @@ def parse_arguments(argv):
"quiet": config.getboolean("quiet", False), "quiet": config.getboolean("quiet", False),
"debug": config.getboolean("debug", False), "debug": config.getboolean("debug", False),
"logfile": config.getboolean("logfile", ""), "logfile": config.getboolean("logfile", ""),
"udp_discovery": config.getboolean("udp_discovery", False), "server_discovery": config.getboolean("server_discovery", False),
} }
parser.set_defaults(**defaults) parser.set_defaults(**defaults)
@ -144,7 +144,7 @@ def set_config(args):
server_config["record"] = args.record server_config["record"] = args.record
server_config["debug"] = str(args.debug) server_config["debug"] = str(args.debug)
server_config["shell"] = str(args.shell) server_config["shell"] = str(args.shell)
server_config["udp_discovery"] = str(args.udpdiscovery) server_config["server_discovery"] = str(args.serverdiscovery)
config.set_section_config("Server", server_config) config.set_section_config("Server", server_config)

2
gns3server/web/web_server.py
View File

@ -299,7 +299,7 @@ class WebServer:
if server_config.getboolean("shell"): if server_config.getboolean("shell"):
asyncio.async(self.start_shell()) asyncio.async(self.start_shell())
if sys.platform.startswith("linux") and server_config.getboolean("udp_discovery"): if sys.platform.startswith("linux") and server_config.getboolean("server_discovery"):
# UDP discovery is only supported on Linux # UDP discovery is only supported on Linux
udp_server_discovery = threading.Thread(target=self._udp_server_discovery, daemon=True) udp_server_discovery = threading.Thread(target=self._udp_server_discovery, daemon=True)
udp_server_discovery.start() udp_server_discovery.start()