Changeset 929

Timestamp:

07/31/13 16:27:18 (11 years ago)

Author:

ramonb

Message:

• revert

File:

• branches/1.1/jobarchived/jobarchived.py (modified) (8 diffs)

branches/1.1/jobarchived/jobarchived.py

@@ -932 +932 @@
         """
 
-        global ARCHIVE_DATASOURCES
-
         jobinfo = { }
 
@@ -1027 +1025 @@
                     debug_msg( 10, 'jobinfo for job %s has changed' %jobid )
             else:
-                debug_msg( 10, 'new job %s' %jobid )
+                debug_msg( 1, 'new job %s' %jobid )
 
                 if not jobid in self.jobs_to_store:
@@ -1146 +1144 @@
         """Find all existing clusters in archive dir"""
 
-        global ARCHIVE_DATASOURCES
-
         archive_dir    = check_dir(ARCHIVE_PATH)
 
@@ -1177 +1173 @@
                     self.clusters[ clustername ] = RRDHandler( self.config, clustername )
 
-                    debug_msg( 9, 'Found cluster dir: %s' %( clustername ) )
-
-        debug_msg( 9, "Found "+str(len(self.clusters.keys()))+" cluster dirs" )
+        debug_msg( 9, "Found "+str(len(self.clusters.keys()))+" clusters" )
 
     def startElement( self, name, attrs ):
         """Memorize appropriate data from xml start tags"""
 
-        global ARCHIVE_DATASOURCES
-
         if name == 'GANGLIA_XML':
 
@@ -1209 +1201 @@
                 self.clusters[ self.clusterName ] = RRDHandler( self.config, self.clusterName )
 
-            debug_msg( 10, ' |-Cluster found: %s' %( self.clusterName ) )
+                debug_msg( 10, ' |-Cluster found: %s' %( self.clusterName ) )
 
         elif name == 'HOST' and self.clusterName in ARCHIVE_DATASOURCES:     
@@ -1246 +1238 @@
                 self.clusters[ self.clusterName ].memMetric( self.hostName, myMetric )
 
-                debug_msg( 9, 'added metric %s from host %s to cluster %s' %( myMetric['name'], self.hostName, self.clusterName ) )
                 debug_msg( 11, ' | | |-metric: %s:%s' %( myMetric['name'], myMetric['val'] ) )
 
@@ -1679 +1670 @@
     """Class for handling RRD activity"""
 
+    myMetrics   = { }
+    lastStored  = { }
+    timeserials = { }
+    slot = None
 
     def __init__( self, config, cluster ):
@@ -1689 +1684 @@
         self.config  = config
         self.slot    = threading.Lock()
-        self.myMetrics   = { }
-        self.lastStored  = { }
-        self.timeserials = { }
 
         if MODRRDTOOL: