ensure descriptors is defined globally

carenas · carenas · commit ff7e503ea253 · 2011-03-13T21:58:35.000-07:00
descriptors is used globally and should be initialized globally as well
diff --git a/diskstat/python_modules/diskstat.py b/diskstat/python_modules/diskstat.py
@@ -41,6 +41,8 @@
 import traceback
 import logging
 
+descriptors = []
+
 logging.basicConfig(level=logging.ERROR, format="%(asctime)s - %(name)s - %(levelname)s\t Thread-%(thread)d - %(message)s", filename='/tmp/gmond.log', filemode='w')
 logging.debug('starting up')
 
@@ -280,7 +282,6 @@ def metric_init(params):
 
 	update_stats()
 
-	descriptors = []
 	for label in descriptions:
 		for dev in PARTITIONS: 
 			if stats[dev].has_key(label):
diff --git a/ehcache/python_modules/ehcache.py b/ehcache/python_modules/ehcache.py
@@ -20,6 +20,8 @@
 import tempfile
 import logging
 
+descriptors = []
+
 logging.basicConfig(level=logging.ERROR, format="%(asctime)s - %(name)s - %(levelname)s\t Thread-%(thread)d - %(message)s", filename='/tmp/gmond.log', filemode='w')
 #logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s\t Thread-%(thread)d - %(message)s", filename='/tmp/gmond.log2')
 logging.debug('starting up')
@@ -147,7 +149,6 @@ def metric_init(params):
 		descriptions[name] = {}
 
 	time_max = 60
-	descriptors = []
 	for label in descriptions:
 		if stats.has_key(label):
 
diff --git a/httpd/python_modules/httpd.py b/httpd/python_modules/httpd.py
@@ -42,6 +42,8 @@
 import sys, re
 import logging
 
+descriptors = []
+
 logging.basicConfig(level=logging.ERROR, format="%(asctime)s - %(name)s - %(levelname)s\t Thread-%(thread)d - %(message)s", filename='/tmp/gmond.log', filemode='w')
 logging.debug('starting up')
 
@@ -361,7 +363,6 @@ def metric_init(params):
 	update_stats()
 	update_server_stats()
 
-	descriptors = []
 	for label in descriptions:
 		if httpd_stats.has_key(label):
 			d = {
diff --git a/jmxsh/python_modules/jmxsh.py b/jmxsh/python_modules/jmxsh.py
@@ -38,6 +38,8 @@
 import tempfile
 import logging
 
+descriptors = []
+
 logging.basicConfig(level=logging.ERROR, format="%(asctime)s - %(name)s - %(levelname)s\t Thread-%(thread)d - %(message)s", filename='/tmp/gmond.log', filemode='w')
 #logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s\t Thread-%(thread)d - %(message)s", filename='/tmp/gmond.log2')
 logging.debug('starting up')
@@ -240,7 +242,6 @@ def metric_init(params):
 		}
 
 	time_max = 60
-	descriptors = []
 	for label in descriptions:
 		if stats.has_key(label):
 
diff --git a/mysqld/python_modules/mysql.py b/mysqld/python_modules/mysql.py
@@ -45,6 +45,9 @@
 from DBUtil import parse_innodb_status
 
 import logging
+
+descriptors = []
+
 logging.basicConfig(level=logging.ERROR, format="%(asctime)s - %(name)s - %(levelname)s\t Thread-%(thread)d - %(message)s", filename='/tmp/gmond.log', filemode='w')
 logging.debug('starting up')
 
@@ -990,7 +993,6 @@ def metric_init(params):
 			},
 		)
 
-	descriptors = []
 	update_stats(REPORT_INNODB, REPORT_MASTER, REPORT_SLAVE)
 
 	time.sleep(MAX_UPDATE_TIME)
diff --git a/procstat/python_modules/procstat.py b/procstat/python_modules/procstat.py
@@ -105,6 +105,8 @@
 import glob
 import logging
 
+descriptors = []
+
 logging.basicConfig(level=logging.ERROR, format="%(asctime)s - %(name)s - %(levelname)s\t Thread-%(thread)d - %(message)s", filename='/tmp/gmond.log', filemode='w')
 logging.debug('starting up')
 
@@ -372,7 +374,6 @@ def metric_init(params):
 	)
 
 	time_max = 60
-	descriptors = []
 	for label in descriptions:
 		for proc in PROCESSES:
 			if stats[proc].has_key(label):
