Merge branch 'issue1067' into develop

nicolargo · Mar 27, 2017 · 0e8485a · 0e8485a
2 parents ae4abc3 + 6ef3976
commit 0e8485a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -19,6 +19,13 @@ Bugs corrected:
     * Sensor values don't refresh since psutil backend (issue #1061)
     * glances-version.db Permission denied (issue #1066)
 
+Version 2.8.9
+=============
+
+Bugs corrected:
+
+    * On Windows --export-statsd terminates immediately and does not export (issue #1067)
+
 Version 2.8.8
 =============
 

diff --git a/glances/__init__.py b/glances/__init__.py
@@ -83,9 +83,9 @@ def start(config, args):
     # Load mode
     global mode
 
-    if core.is_standalone() and not WINDOWS:
+    if core.is_standalone():
         from glances.standalone import GlancesStandalone as GlancesMode
-    elif core.is_client() and not WINDOWS:
+    elif core.is_client():
         if core.is_client_browser():
             from glances.client_browser import GlancesClientBrowser as GlancesMode
         else:

diff --git a/glances/main.py b/glances/main.py
@@ -369,13 +369,17 @@ def parse_args(self):
         # Export is only available in standalone or client mode (issue #614)
         export_tag = (
             args.export_csv or
+            args.export_cassandra or
+            args.export_couchdb or
             args.export_elasticsearch or
-            args.export_statsd or
             args.export_influxdb or
-            args.export_cassandra or
+            args.export_kafka or
             args.export_opentsdb or
+            args.export_prometheus or
             args.export_rabbitmq or
-            args.export_couchdb
+            args.export_riemann or
+            args.export_statsd or
+            args.export_zeromq
         )
         if WINDOWS and export_tag:
             # On Windows, export is possible but only in quiet mode