Changeset 35 for trunk

Timestamp:

04/04/05 12:45:40 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

More bugfixes

• Need to find a way to share data between Child and Parent or find a different way to handle it

File:

• trunk/daemon/togad.py (modified) (8 diffs)

trunk/daemon/togad.py

@@ -59 +59 @@
         "Parse Ganglia's XML"
 
-        clusters = { }
-        config = None
-
         def __init__( self, config ):
                 self.config = config
+                self.clusters = { }
 
         def startElement( self, name, attrs ):
@@ -87 +85 @@
                         self.time = attrs.get( 'LOCALTIME', "" )
 
-                        if not self.clusters.has_key( self.clusterName ):
+                        if not self.clusters.has_key( self.clusterName ) and self.clusterName in ARCHIVE_SOURCES:
 
                                 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_SOURCES:     
@@ -295 +293 @@
 
                 else:
-                        self.grabXML()
+                        #self.grabXML()
+                        self.processXML()
                         self.storeMetrics()
 
@@ -412 +411 @@
                 self.myMetrics[ host ][ metric['name'] ].append( metric )
 
-        def makeUpdateString( self, host, metric ):
+        def makeUpdateString( self, host, metricname ):
 
                 update_string = ''
 
-                for m in self.myMetrics[ host ][ metric['name'] ]:
-
-                        update_string = update_string + ' %s:%s' %( metric['time'], metric['val'] )
+                for m in self.myMetrics[ host ][ metricname ]:
+
+                        update_string = update_string + ' %s:%s' %( m['time'], m['val'] )
 
                 return update_string
@@ -428 +427 @@
                         for metricname, mymetric in mymetrics.items():
 
-                                self.rrd.createCheck( hostname, metricname, timeserial )        
-                                update_okay = self.rrd.update( hostname, metricname, timeserial )
+                                mytime = self.makeTimeSerial()
+                                self.createCheck( hostname, metricname, mytime )        
+                                update_okay = self.update( hostname, metricname, mytime )
 
                                 if not update_okay:
@@ -459 +459 @@
                 else:
                         rrd_dir = '%s/%s/%s/%s' %( check_dir(ARCHIVE_PATH), self.cluster, host, timeserial )
-                if metric:
+                if metricname:
                         rrd_file = '%s/%s.rrd' %( rrd_dir, metricname )
                 else:
@@ -533 +533 @@
                                 first_time = metric['time']
 
+                return first_time
+
         def createCheck( self, host, metricname, timeserial ):
                 "Check if an .rrd allready exists for this metric, create if not"
 
-                debug_msg( 9, 'rrdcreate: using timeserial %s for %s/%s' %( timeserial, host, metric['name'] ) )
+                debug_msg( 9, 'rrdcreate: using timeserial %s for %s/%s' %( timeserial, host, metricname ) )
 
                 rrd_dir, rrd_file = self.makeRrdPath( host, metricname, timeserial )
@@ -564 +566 @@
         def update( self, host, metricname, timeserial ):
 
-                debug_msg( 9, 'rrdupdate: using timeserial %s for %s/%s' %( timeserial, host, metric['name'] ) )
+                debug_msg( 9, 'rrdupdate: using timeserial %s for %s/%s' %( timeserial, host, metricname ) )
 
                 rrd_dir, rrd_file = self.makeRrdPath( host, metricname, timeserial )