Changeset 71

Timestamp:

04/15/05 11:03:19 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Added XML Error Handler

File:

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

trunk/daemon/togad.py

@@ -2 +2 @@
 
 import xml.sax
-from xml.sax.handler import ContentHandler 
+import xml.sax.handler
 import socket
 import sys
@@ -154 +154 @@
                 return 0
 
-class TorqueXMLHandler( ContentHandler ):
+class TorqueXMLHandler( xml.sax.handler.ContentHandler ):
         """Parse Torque's jobinfo XML from our plugin"""
 
@@ -192 +192 @@
                                         #if name == '
 
-class GangliaXMLHandler( ContentHandler ):
+class GangliaXMLHandler( xml.sax.handler.ContentHandler ):
         """Parse Ganglia's XML"""
 
@@ -287 +287 @@
                 return 0
 
+class XMLErrorHandler( xml.sax.handler.ErrorHandler ):
+
+        def error( self, exception ):
+                """Recoverable error"""
+
+                debug_msg( 0, 'Recoverable error ' + str( exception ) )
+
+        def fatalError( self, exception ):
+                """Non-recoverable error"""
+
+                exception_str = str( exception )
+
+                # Ignore 'no element found' errors
+                if exception_str.find( 'no element found' ) != -1:
+                        debug_msg( 1, 'No XML data found: probably socket not (re)connected.' )
+                        return 0
+
+                debug_msg( 0, 'Non-recoverable error ' + str( exception ) )
+                sys.exit( 1 )
+
+        def warning( self, exception ):
+                """Warning"""
+
+                debug_msg( 0, 'Warning ' + str( exception ) )
+
 class GangliaXMLGatherer:
         """Setup a connection and file object to Ganglia's XML"""
@@ -337 +362 @@
 
                 if self.s:
+                        self.s.shutdown( 2 )
                         self.s.close()
-                        self.s.shutdown( 2 )
                         self.s = None
 
@@ -378 +403 @@
                 self.myXMLGatherer = GangliaXMLGatherer( ARCHIVE_XMLSOURCE.split( ':' )[0], ARCHIVE_XMLSOURCE.split( ':' )[1] ) 
                 self.myXMLSource = self.myXMLGatherer.getFileObject()
-                #self.myParser = make_parser()   
                 while( 1 ):
                         print 'parse'
-                        xml.sax.parse( self.getFileObject(), TorqueXMLHandler() )
+                        self.myXMLGatherer.makeFileDescriptor()
+                        self.myXMLSource = self.myXMLGatherer.getFileObject()
+                        xml.sax.parse( self.myXMLSource, TorqueXMLHandler(), XMLErrorHandler() )
                         print 'sleep'
                         time.sleep( 1 )