Changeset 353 for trunk

Timestamp:

04/13/10 10:29:12 (11 years ago)

Author:

sander

Message:

Catch ExpatError? caused by HTML error output of the server

File:

• trunk/factory/src/factory.py (modified) (3 diffs)

trunk/factory/src/factory.py

@@ -32 +32 @@
 from backends import BackendException
 from xmlrpclib import ServerProxy, Error, Fault
+from xml.parsers.expat import ExpatError
 
 LOGLEVELS = {'debug': logging.DEBUG,
@@ -159 +160 @@
                         time.sleep(60)
                         return True
+                except ExpatError, ex:
+                        logging.error("XML parsing fault. Server probably sent an error in HTML. Poll failed. Sleeping.")
+                        time.sleep(60)
+                        return True
 
                 if len(job) == 0:
@@ -190 +195 @@
                                         time.sleep(60)
                                         return True
+                                except ExpatError, ex:
+                                        logging.error("XML parsing fault. Server probably sent an error in HTML. Poll failed. Sleeping.")
+                                        time.sleep(60)
+                                        return True
 
                                 logging.info('Processed job %s', job['job'])