Changeset 176 for trunk/daemon

Timestamp:

08/01/05 15:46:06 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• (hopefully) REALLY fixed threading exception handling
• Added IndexError? exception handler for metric .pop() somehow it still happens sometimes
• Made sure all threads return 0 so they won't hang
• Added socket.error exception handler for XML parsing

File:

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

trunk/daemon/togad.py

@@ -10 +10 @@
 import os.path
 import time
+import thread
 import threading
 import random
@@ -381 +382 @@
                         self.myXMLSource = self.myXMLGatherer.getFileObject()
                         debug_msg( 1, 'torque_xml_thread(): Parsing..' )
-                        xml.sax.parse( self.myXMLSource, self.myXMLHandler, self.myXMLError )
+
+                        try:
+                                xml.sax.parse( self.myXMLSource, self.myXMLHandler, self.myXMLError )
+                        except socket.error, msg:
+                                debug_msg( 0, 'ERROR: Socket error in connect to datasource!: %s' %msg )
+                                
                         debug_msg( 1, 'torque_xml_thread(): Done parsing.' )
                         debug_msg( 1, 'torque_xml_thread(): Sleeping.. (%ss)' %(str( self.config.getLowestInterval() ) ) )
@@ -761 +767 @@
                                         xml_thread = threading.Thread( None, self.processXML, 'xml_thread' )
                                         xml_thread.start()
-                                except error, msg:
+                                except thread.error, msg:
                                         debug_msg( 0, 'ERROR: Unable to start xml_thread!: '+str(msg))
                                         #return 1
@@ -773 +779 @@
                                         store_thread = threading.Thread( None, self.storeMetrics, 'store_thread' )
                                         store_thread.start()
-                                except error, msg:
+                                except thread.error, msg:
                                         debug_msg( 0, 'ERROR: Unable to start store_thread!: '+str(msg))
                                         #return 1
@@ -790 +796 @@
                         store_metric_thread = threading.Thread( None, self.storeThread, 'store_metric_thread' )
                         store_metric_thread.start()
-                except error, msg:
+                except thread.error, msg:
                         debug_msg( 0, 'ERROR: Unable to start ganglia_store_thread()!: '+str(msg) )
                         return 1
@@ -816 +822 @@
                 debug_msg( 1, 'ganglia_store_metric_thread(): Storing data..' )
                 ret = self.myXMLHandler.storeMetrics()
+                if ret > 0:
+                        debug_msg( 0, 'ganglia_store_metric_thread(): UNKNOWN ERROR %s while storing Metrics!' %str(ret) )
                 debug_msg( 1, 'ganglia_store_metric_thread(): Done storing.' )
                 debug_msg( 1, 'ganglia_store_metric_thread(): finished.' )
                 
-                return ret
+                return 0
 
         def processXML( self ):
@@ -827 +835 @@
                         parsethread = threading.Thread( None, self.parseThread, 'parsethread' )
                         parsethread.start()
-                except error, msg:
+                except thread.error, msg:
                         debug_msg( 0, 'ERROR: Unable to start ganglia_xml_thread()!: ' + str(msg) )
                         return 1
@@ -853 +861 @@
                 debug_msg( 1, 'ganglia_parse_thread(): Parsing XML..' )
                 self.myXMLSource = self.myXMLGatherer.getFileObject()
-                ret = xml.sax.parse( self.myXMLSource, self.myXMLHandler, self.myXMLError )
+
+                try:
+                        xml.sax.parse( self.myXMLSource, self.myXMLHandler, self.myXMLError )
+                except socket.error, msg:
+                        debug_msg( 0, 'ERROR: Socket error in connect to datasource!: %s' %msg )
+
                 debug_msg( 1, 'ganglia_parse_thread(): Done parsing.' )
                 debug_msg( 1, 'ganglia_parse_thread(): finished.' )
 
-                return ret
+                return 0
 
 class GangliaConfigParser:
@@ -1115 +1128 @@
 
                                         if len( self.myMetrics[ hostname ][ metricname ] ) > 0:
-                                                metrics_to_store.append( self.myMetrics[ hostname ][ metricname ].pop( 0 ) )
+
+                                                try:
+                                                        metrics_to_store.append( self.myMetrics[ hostname ][ metricname ].pop( 0 ) )
+                                                except IndexError, msg:
+
+                                                        pass
 
                                 self.slot.release()
@@ -1353 +1371 @@
                 ganglia_xml_thread.start()
                 
-        except error, msg:
+        except thread.error, msg:
                 debug_msg( 0, 'FATAL ERROR: Unable to start main threads!: '+ str(msg) )
                 syslog.closelog()