summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2017-03-27 17:00:03 +0200
committernicolargo <nicolas@nicolargo.com>2017-03-27 17:00:03 +0200
commit0e8485a4616e06a46f641a22cd34b4f109de1ec7 (patch)
tree82dbaed416f78e8a2b99cdd0858111bbd18f3732
parentae4abc3c075cc2bab940cbbb3833ad90a557a90e (diff)
parent6ef39763587295b7637b4020eeb7f539da0b7574 (diff)
Merge branch 'issue1067' into develop
-rw-r--r--NEWS7
-rw-r--r--glances/__init__.py4
-rw-r--r--glances/main.py10
3 files changed, 16 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 1e668376..40dc1e02 100644
--- 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
index 9e3486af..d1946716 100644
--- 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
index 928e01c8..a82410ad 100644
--- a/glances/main.py
+++ b/glances/main.py
@@ -369,13 +369,17 @@ Examples of use:
# 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