Changeset 335

Timestamp:

03/26/10 10:36:39 (11 years ago)

Author:

sander

Message:

Do not crash factory when the oooserver dies mid-conversion

Location:

trunk/factory/src/backends

Files:

• __init__.py (modified) (2 diffs)
• oooserver.py (modified) (2 diffs)

trunk/factory/src/backends/__init__.py

@@ -52 +52 @@
                 self.application = config.get(section, 'application').lower()
                 self.version = config.get(section, 'version').lower()
-                self.doctype = config.get(section, 'doctype')
+                self.doctype = [s.strip() for s in config.get(section, 'doctype').split(',')]
                 self.formats = [s.strip() for s in config.get(section, 'formats').split(',')]
         
@@ -68 +68 @@
                         job['application'].lower() == self.application and
                         job['version'].lower() == self.version and
-                        job['doctype'] == self.doctype and
+                        job['doctype'] in self.doctype and
                         (job['format'] == '' or job['format'] in self.formats)
                 )
+
                 return eligable
 

trunk/factory/src/backends/oooserver.py

@@ -16 +16 @@
 
 from backends import Backend, BackendException
+from com.sun.star.uno import RuntimeException
 from com.sun.star.beans import PropertyValue
 from com.sun.star.connection import NoConnectException
@@ -122 +123 @@
                 src_file_url = self.file_url(src_file)
                 filter_name = self.filter_name(job['doctype'], job['format'])
-                document = self.desktop.loadComponentFromURL(src_file_url, "_blank", 0, _unoProps(Hidden=True, ReadOnly=True, UpdateDocMode=QUIET_UPDATE))
 
-                if document is None:
-                        raise OOOServerException("The document '%s' could not be opened." % src_file_url, True)
+                try:
+                        document = self.desktop.loadComponentFromURL(src_file_url, "_blank", 0, _unoProps(Hidden=True, ReadOnly=True, UpdateDocMode=QUIET_UPDATE))
 
-                document.storeToURL(self.file_url(dst_file), _unoProps(FilterName=filter_name))
-                document.close(True)
+                        if document is None:
+                                raise OOOServerException("The document '%s' could not be opened." % src_file_url, True)
+
+                        document.storeToURL(self.file_url(dst_file), _unoProps(FilterName=filter_name))
+                        document.close(True)
+                except RuntimeException:
+                        raise OOOServerException("UNO RuntimeException in OOOServer. The server probably died. Unloading backend.", False)
 
                 logging.info('OOOServer converted %s to %s' % (src_file, dst_file))