Changeset 926 for branches/1.1

Timestamp:

07/16/13 21:02:24 (10 years ago)

Author:

ramonb

Message:

jobarchived/jobarchived.py:

• changed XMLErrorHandler so that fatal error's are remembered for later use
• exit daemon if fatal XML error occurs
• see #170

File:

• branches/1.1/jobarchived/jobarchived.py (modified) (3 diffs)

branches/1.1/jobarchived/jobarchived.py

@@ -870 +870 @@
                 xml.sax.parseString( my_data, self.myXMLHandler, self.myXMLError )
 
+                if self.myXMLError.isFatal():
+
+                    sys.exit( 1 )
+
                 debug_msg( 1, 'job_xml_thread(): Done parsing.' )
             else:
@@ -1251 +1255 @@
 class XMLErrorHandler( xml.sax.handler.ErrorHandler ):
 
+    def __init__( self ):
+
+        self.me_fatal = False
+
     def error( self, exception ):
         """Recoverable error"""
@@ -1263 +1271 @@
         # Ignore 'no element found' errors
         if exception_str.find( 'no element found' ) != -1:
+
             debug_msg( 0, 'No XML data found: Socket not (re)connected or datasource not available.' )
             return 0
 
+        self.me_fatal = True
+
         debug_msg( 0, 'FATAL ERROR: Non-recoverable XML error ' + str( exception ) )
-        sys.exit( 1 )
+
+    def isFatal( self ):
+
+        return self.me_fatal
 
     def warning( self, exception ):