Changeset 179 for trunk/daemon

Timestamp:

08/03/05 10:24:23 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Rearranged thread locking, I suspect a conflict
• Disabled error checking on rrd update:
  • more important to have correct last update time!
  • with correct update time there will be no errors anyway

File:

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

trunk/daemon/togad.py

@@ -1019 +1019 @@
                 """Store metric from host in memory"""
 
+                # <ATOMIC>
+                #
+                self.slot.acquire()
+                
                 if self.myMetrics.has_key( host ):
 
@@ -1028 +1032 @@
 
                                                 # Allready have this metric, abort
+                                                self.slot.release()
                                                 return 1
                         else:
@@ -1038 +1043 @@
                 # atomic code; only 1 thread at a time may access the stack
 
-                # <ATOMIC>
-                #
-                self.slot.acquire()
-
                 self.myMetrics[ host ][ metric['name'] ].append( metric )
 
@@ -1133 +1134 @@
                                                 except IndexError, msg:
 
+                                                        # Somehow sometimes myMetrics[ hostname ][ metricname ]
+                                                        # is still len 0 when the statement is executed.
+                                                        # Just ignore indexerror's..
                                                         pass
 
@@ -1160 +1164 @@
                                         update_rets.append( update_ret )
 
-                                if not (1) in update_rets:
-
-                                        self.memLastUpdate( hostname, metricname, metrics_to_store )
+                                # Lets ignore errors here for now, we need to make sure last update time
+                                # is correct!
+                                #
+                                #if not (1) in update_rets:
+
+                                self.memLastUpdate( hostname, metricname, metrics_to_store )
 
         def makeTimeSerial( self ):