Rename export folder to avoid error of the dep lib use inside an expo…

…rt plugin has the same name: for example csv, use the python lib csv...
nicolargo · Mar 30, 2024 · 24a3aea · 24a3aea
1 parent ae59661
commit 24a3aea
Show file tree

Hide file tree

Showing 20 changed files with 7 additions and 7 deletions.
diff --git a/glances/exports/export.py b/glances/exports/export.py
@@ -41,7 +41,7 @@ class GlancesExport(object):
 
     def __init__(self, config=None, args=None):
         """Init the export class."""
-        # Export name (= module name without glances_)
+        # Export name
         self.export_name = self.__class__.__module__
         logger.debug("Init export module %s" % self.export_name)
 

diff --git a/glances/exports/cassandra/__init__.py → ...ces/exports/glances_cassandra/__init__.py b/glances/exports/cassandra/__init__.py → ...ces/exports/glances_cassandra/__init__.py
diff --git a/glances/exports/couchdb/__init__.py → glances/exports/glances_couchdb/__init__.py b/glances/exports/couchdb/__init__.py → glances/exports/glances_couchdb/__init__.py
diff --git a/glances/exports/csv/__init__.py → glances/exports/glances_csv/__init__.py b/glances/exports/csv/__init__.py → glances/exports/glances_csv/__init__.py
diff --git a/glances/exports/elasticsearch/__init__.py → ...exports/glances_elasticsearch/__init__.py b/glances/exports/elasticsearch/__init__.py → ...exports/glances_elasticsearch/__init__.py
diff --git a/glances/exports/graph/__init__.py → glances/exports/glances_graph/__init__.py b/glances/exports/graph/__init__.py → glances/exports/glances_graph/__init__.py
diff --git a/glances/exports/graphite/__init__.py → glances/exports/glances_graphite/__init__.py b/glances/exports/graphite/__init__.py → glances/exports/glances_graphite/__init__.py
diff --git a/glances/exports/influxdb2/__init__.py → ...ces/exports/glances_influxdb2/__init__.py b/glances/exports/influxdb2/__init__.py → ...ces/exports/glances_influxdb2/__init__.py
diff --git a/glances/exports/json/__init__.py → glances/exports/glances_json/__init__.py b/glances/exports/json/__init__.py → glances/exports/glances_json/__init__.py
diff --git a/glances/exports/kafka/__init__.py → glances/exports/glances_kafka/__init__.py b/glances/exports/kafka/__init__.py → glances/exports/glances_kafka/__init__.py
diff --git a/glances/exports/mongodb/__init__.py → glances/exports/glances_mongodb/__init__.py b/glances/exports/mongodb/__init__.py → glances/exports/glances_mongodb/__init__.py
diff --git a/glances/exports/mqtt/__init__.py → glances/exports/glances_mqtt/__init__.py b/glances/exports/mqtt/__init__.py → glances/exports/glances_mqtt/__init__.py
diff --git a/glances/exports/opentsdb/__init__.py → glances/exports/glances_opentsdb/__init__.py b/glances/exports/opentsdb/__init__.py → glances/exports/glances_opentsdb/__init__.py
diff --git a/glances/exports/prometheus/__init__.py → ...es/exports/glances_prometheus/__init__.py b/glances/exports/prometheus/__init__.py → ...es/exports/glances_prometheus/__init__.py
diff --git a/glances/exports/rabbitmq/__init__.py → glances/exports/glances_rabbitmq/__init__.py b/glances/exports/rabbitmq/__init__.py → glances/exports/glances_rabbitmq/__init__.py
diff --git a/glances/exports/restful/__init__.py → glances/exports/glances_restful/__init__.py b/glances/exports/restful/__init__.py → glances/exports/glances_restful/__init__.py
diff --git a/glances/exports/riemann/__init__.py → glances/exports/glances_riemann/__init__.py b/glances/exports/riemann/__init__.py → glances/exports/glances_riemann/__init__.py
diff --git a/glances/exports/statsd/__init__.py → glances/exports/glances_statsd/__init__.py b/glances/exports/statsd/__init__.py → glances/exports/glances_statsd/__init__.py
diff --git a/glances/exports/zeromq/__init__.py → glances/exports/glances_zeromq/__init__.py b/glances/exports/zeromq/__init__.py → glances/exports/glances_zeromq/__init__.py
diff --git a/glances/standalone.py b/glances/standalone.py
@@ -142,12 +142,6 @@ def __serve_once(self):
         self.stats.update()
         logger.debug('Stats updated duration: {} seconds'.format(counter.get()))
 
-        # Export stats
-        # Start a counter used to compute the time needed
-        counter_export = Counter()
-        self.stats.export(self.stats)
-        logger.debug('Stats exported duration: {} seconds'.format(counter_export.get()))
-
         # Patch for issue1326 to avoid < 0 refresh
         adapted_refresh = self.refresh_time - counter.get()
         adapted_refresh = adapted_refresh if adapted_refresh > 0 else 0
@@ -164,6 +158,12 @@ def __serve_once(self):
             time.sleep(adapted_refresh)
             ret = True
 
+        # Export stats
+        # Start a counter used to compute the time needed
+        counter_export = Counter()
+        self.stats.export(self.stats)
+        logger.debug('Stats exported duration: {} seconds'.format(counter_export.get()))
+
         return ret
 
     def serve_n(self, n=1):