Changeset 41

Timestamp:

04/05/05 12:29:35 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Added queue len check in atomic code before pop, len might change before start

File:

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

trunk/daemon/togad.py

@@ -95 +95 @@
                 for line in os.popen( self.binary + ' ' + action + ' ' + filename + ' ' + arg_string ).readlines():
 
-                        print line
-
                         if line.find( 'ERROR' ) != -1:
 
@@ -515 +513 @@
 
                 update_list = [ ]
+                metric = None
 
                 while len( self.myMetrics[ host ][ metricname ] ) > 0:
@@ -523 +522 @@
                         self.slot.acquire()
 
-                        metric = self.myMetrics[ host ][ metricname ].pop()
+                        # len might have changed since loop start
+                        #
+                        if len( self.myMetrics[ host ][ metricname ] ) > 0:
+                                metric = self.myMetrics[ host ][ metricname ].pop()
 
                         self.slot.release()
                         # </atomic>
 
-                        if self.checkStoreMetric( host, metricname, metric ):
-                                update_list.append( '%s:%s' %( metric['time'], metric['val'] ) )
-                        else:
-                                print 'allready wrote metric %s with timestamp %s' %( metric['name'], metric['time'] )
+                        if metric:
+                                if self.checkStoreMetric( host, metricname, metric ):
+                                        update_list.append( '%s:%s' %( metric['time'], metric['val'] ) )
+                                else:
+                                        print 'allready wrote metric %s with timestamp %s' %( metric['name'], metric['time'] )
 
                 return update_list
@@ -569 +572 @@
                                 else:
                                         debug_msg( 9, 'metric update failed' )
-                                        return 1
-
-                                return 1
 
         def makeTimeSerial( self ):
@@ -707 +707 @@
                 update_list = self.makeUpdateList( host, metricname )
 
-                ret = self.rrdm.update( str(rrd_file), update_list )
-
-                if ret:
-                        return 1
+                if len( update_list ) > 0:
+                        ret = self.rrdm.update( str(rrd_file), update_list )
+
+                        if ret:
+                                return 1
                 
-                debug_msg( 9, 'updated rrd %s with %s' %( str(rrd_file), string.join( update_list ) ) )
+                        debug_msg( 9, 'updated rrd %s with %s' %( str(rrd_file), string.join( update_list ) ) )
 
                 return 0