diff --git a/console/novncd b/console/novncd index 402e3cdc..d16806fe 100755 --- a/console/novncd +++ b/console/novncd @@ -65,16 +65,6 @@ def get_parser(default_host=WS_HOST, default_port=WS_PORT or 6080, default_cert= return parser -options = get_parser().parse_args() - -FORMAT = "%(asctime)s - %(name)s - %(levelname)s : %(message)s" -if options.debug: - logging.basicConfig(level=logging.DEBUG, format=FORMAT) - options.verbose = True -elif options.verbose: - logging.basicConfig(level=logging.INFO, format=FORMAT) -else: - logging.basicConfig(level=logging.WARNING, format=FORMAT) try: from websockify import WebSocketProxy @@ -302,6 +292,17 @@ else: if __name__ == "__main__": + options = get_parser().parse_args() + + FORMAT = "%(asctime)s - %(name)s - %(levelname)s : %(message)s" + if options.debug: + logging.basicConfig(level=logging.DEBUG, format=FORMAT) + options.verbose = True + elif options.verbose: + logging.basicConfig(level=logging.INFO, format=FORMAT) + else: + logging.basicConfig(level=logging.WARNING, format=FORMAT) + if USE_HANDLER: # Create the WebSocketProxy with NovaProxyRequestHandler handler server = WebSocketProxy( diff --git a/console/templates/console-base.html b/console/templates/console-base.html index 11e38fd4..ecb8ed21 100644 --- a/console/templates/console-base.html +++ b/console/templates/console-base.html @@ -35,7 +35,7 @@
-