diff options
| -rwxr-xr-x | bin/fg21sim-webui | 21 | ||||
| -rw-r--r-- | fg21sim/webui/websocket.py | 6 |
2 files changed, 19 insertions, 8 deletions
diff --git a/bin/fg21sim-webui b/bin/fg21sim-webui index 642039e..a0c0668 100755 --- a/bin/fg21sim-webui +++ b/bin/fg21sim-webui @@ -31,6 +31,10 @@ from fg21sim.webui import Application # Define options in the global namespace # These options can also be used in other modules +define("host", default="localhost", type=str, + help=("IP address or hostname the server will listen on. " + "Specify '0.0.0.0' or '' (empty string) to listen on " + "all available interfaces.")) define("port", default=21127, type=int, help="Server listen port") define("debug", default=False, help="Enable the debug mode") define("no_browser", default=False, @@ -54,6 +58,9 @@ def main(): except ValueError as e: raise ValueError("Option 'hosts_allowed' invalid: " + str(e)) + if options.host == "": + options.host = "0.0.0.0" + loglevel = "DEBUG" if options.debug else None setup_logging(dict_config=configs.logging, level=loglevel) tool = os.path.basename(sys.argv[0]) @@ -61,13 +68,17 @@ def main(): logger.info("COMMAND: {0}".format(" ".join(sys.argv))) application = Application(debug=options.debug) - application.listen(options.port) - url = "http://localhost:{port}".format(port=options.port) - logger.info("Tornado started") - logger.info("You can use the Web UI by accessing:\n\t{0}".format(url)) + application.listen(options.port, address=options.host) + listen_url = "http://{host}:{port}".format(host=options.host, + port=options.port) + access_url = "http://{host}:{port}".format(host="localhost", + port=options.port) + logger.info("Tornado started on: {0}".format(listen_url)) + logger.info("You can use the Web UI by accessing:" + + "\n\t{0}".format(access_url)) if not options.no_browser: # Open the Web UI in a new browser tab - webbrowser.open_new_tab(url) + webbrowser.open_new_tab(access_url) logger.info("Hosts allowed to access the Web UI: {0}".format( options.hosts_allowed)) diff --git a/fg21sim/webui/websocket.py b/fg21sim/webui/websocket.py index 0e7f07f..00bda03 100644 --- a/fg21sim/webui/websocket.py +++ b/fg21sim/webui/websocket.py @@ -84,11 +84,11 @@ class FG21simWSHandler(tornado.websocket.WebSocketHandler): elif network.upper() == "ANY": # Any hosts are allowed allow = True - logger.error("WebSocket: %s: any hosts are allowed" % self.name) + logger.warning("WebSocket: %s: any hosts are allowed" % self.name) elif ip_in_network(ip, network): allow = True - logger.error("WebSocket: %s: " % self.name + - "client is in the allowed network: %s" % network) + logger.info("WebSocket: %s: " % self.name + + "client is in the allowed network: %s" % network) else: allow = False logger.error("WebSocket: %s: " % self.name + |