diff options
author | nicolargo <nicolas@nicolargo.com> | 2017-03-11 18:21:39 +0100 |
---|---|---|
committer | nicolargo <nicolas@nicolargo.com> | 2017-03-11 18:21:39 +0100 |
commit | 43f7eb43f54bac21d3586d4facb8b485f19cf884 (patch) | |
tree | cfd113ffa79a5c68502f494039c20cbaded0c882 | |
parent | 17d6318ed5ee94d43819c69d61d4ef1d0ffa1522 (diff) |
Global name standalone not defined (#1030)v2.8.6
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | glances/__init__.py | 13 |
2 files changed, 8 insertions, 9 deletions
@@ -2,10 +2,12 @@ Glances Version 2 ============================================================================== -Version 2.9.0 +Version 2.8.6 ============= +Bugs corrected: + * Windows OS - Global name standalone not defined (#1030) Version 2.8.5 ============= diff --git a/glances/__init__.py b/glances/__init__.py index 4d65f5b9..2b2d2576 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -27,7 +27,7 @@ import signal import sys # Global name -__version__ = '2.9.0_DEVELOP' +__version__ = '2.8.6' __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>' __license__ = 'LGPLv3' @@ -70,11 +70,11 @@ def __signal_handler(signal, frame): def end(): """Stop Glances.""" - if core.is_standalone(): + if core.is_standalone() and not WINDOWS: # Stop the standalone (CLI) standalone.end() logger.info("Stop Glances (with CTRL-C)") - elif core.is_client(): + elif core.is_client() and not WINDOWS: # Stop the client client.end() logger.info("Stop Glances client (with CTRL-C)") @@ -82,7 +82,7 @@ def end(): # Stop the server server.end() logger.info("Stop Glances server (with CTRL-C)") - elif core.is_webserver() or core.is_standalone(): + elif core.is_webserver(): # Stop the Web server webserver.end() logger.info("Stop Glances web server(with CTRL-C)") @@ -221,7 +221,7 @@ def main(): signal.signal(signal.SIGINT, __signal_handler) # Glances can be ran in standalone, client or server mode - if core.is_standalone(): + if core.is_standalone()and not WINDOWS: start_standalone(config=config, args=args) elif core.is_client() and not WINDOWS: if core.is_client_browser(): @@ -232,7 +232,4 @@ def main(): start_server(config=config, args=args) elif core.is_webserver(): # Web server mode replace the standalone mode on Windows OS - # In this case, try to start the web browser mode automaticaly - if WINDOWS: - args.open_web_browser = True start_webserver(config=config, args=args) |