Changeset 34 for trunk

Timestamp:

04/04/05 11:53:39 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Numerous bugfixes Data is still not written, storeMetrics doesn't run

File:

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

trunk/daemon/togad.py

@@ -20 +20 @@
 # <=7  = daemon threading - NOTE: Daemon will 'halt on all errors' from this level
 #
-DEBUG_LEVEL = 9
+DEBUG_LEVEL = 10
 
 # Where is the gmetad.conf located
@@ -89 +89 @@
                         if not self.clusters.has_key( self.clusterName ):
 
-                                self.clusters[ self.clusterName ] = RRDHandler( self.clusterName )
+                                self.clusters[ self.clusterName ] = RRDHandler( self.config, self.clusterName )
 
                         debug_msg( 10, ' |-Cluster found: %s' %( self.clusterName ) )
@@ -112 +112 @@
                                 myMetric['time'] = self.hostReported
 
-                                self.clusters[ self.clusterName ].memMetric( self.hostname, myMetric )
-
-                        debug_msg( 11, ' | | |-metric: %s:%s' %( myMetric['name'], myMetric['val'] ) )
-
-        def storeMetrics( self, hostname, timeserial ):
-
-                for cluster in self.clusters:
-
-                        cluster.storeMetrics()
+                                self.clusters[ self.clusterName ].memMetric( self.hostName, myMetric )
+
+                                debug_msg( 11, ' | | |-metric: %s:%s' %( myMetric['name'], myMetric['val'] ) )
+
+        def storeMetrics( self ):
+
+                for clustername, rrdh in self.clusters.items():
+
+                        print 'storing metrics of cluster ' + clustername
+                        rrdh.storeMetrics()
 
 class GangliaXMLGatherer:
@@ -264 +265 @@
                         # Make sure XML is processed on time and at regular intervals
 
-                        debug_msg( 7, self.printTime() + ' - mainthread() - Sleep '+ str( self.config.getInterval() ) +'s: zzzzz..' )
-                        time.sleep( self.config.getInterval() )
+                        debug_msg( 7, self.printTime() + ' - mainthread() - Sleep '+ str( self.config.getLowestInterval() ) +'s: zzzzz..' )
+                        time.sleep( float( self.config.getLowestInterval() ) )
                         debug_msg( 7, self.printTime() + ' - mainthread() - Awoken: waiting for XML thread..' )
 
@@ -309 +310 @@
 class GangliaConfigParser:
 
-        sources = { }
+        sources = [ ]
 
         def __init__( self, config ):
@@ -363 +364 @@
                 return None
 
+        def getLowestInterval( self ):
+
+                lowest_interval = 0
+
+                for source in self.sources:
+
+                        if not lowest_interval or source['interval'] <= lowest_interval:
+
+                                lowest_interval = source['interval']
+
+                # Return 15 when nothing is found, so that the daemon won't go insane with 0 sec delays
+                if lowest_interval:
+                        return lowest_interval
+                else:
+                        return 15
+
 class RRDHandler:
 
@@ -376 +393 @@
         def memMetric( self, host, metric ):
 
-                for m in self.myMetrics[ host ]:
-
-                        if m['time'] == metric['time']:
-
-                                # Allready have this metric, abort
-                                return 1
-
-                if not self.myMetrics.has_key( host ):
-
+                if self.myMetrics.has_key( host ):
+
+                        if self.myMetrics[ host ].has_key( metric['name'] ):
+
+                                for mymetric in self.myMetrics[ host ][ metric['name'] ]:
+
+                                        if mymetric['time'] == metric['time']:
+
+                                                # Allready have this metric, abort
+                                                return 1
+                        else:
+                                self.myMetrics[ host ][ metric['name'] ] = [ ]
+                else:
                         self.myMetrics[ host ] = { }
-
-                if not self.myMetrics[ host ].has_key( metric['name'] ):
-
                         self.myMetrics[ host ][ metric['name'] ] = [ ]
+
 
                 self.myMetrics[ host ][ metric['name'] ].append( metric )