unoconv: add timeout to kill process after 60s

 * When a libreoffice convert process takes longer than 60s, kill the
   process and throw an error.  Libreoffice occasionally hangs
   indefinitely, causing MFR requests to never finish.

Author: felliott

mfr/extensions/unoconv/export.py

@@ -11,15 +11,15 @@ class UnoconvExporter(extension.BaseExporter):
 
     def export(self):
         try:
-            subprocess.check_call([
+            subprocess.run([
                 settings.UNOCONV_BIN,
                 '-n',
                 '-c', 'socket,host={},port={};urp;StarOffice.ComponentContext'.format(settings.ADDRESS, settings.PORT),
                 '-f', self.format,
                 '-o', self.output_file_path,
                 '-vvv',
                 self.source_file_path
-            ])
+            ], check=True, timeout=settings.UNOCONV_TIMEOUT)
         except subprocess.CalledProcessError as err:
             name, extension = os.path.splitext(os.path.split(self.source_file_path)[-1])
             raise exceptions.SubprocessError(

mfr/extensions/unoconv/settings.py

@@ -6,6 +6,7 @@
 config = settings.child('UNOCONV_EXTENSION_CONFIG')
 
 UNOCONV_BIN = config.get('UNOCONV_BIN', '/usr/local/bin/unoconv')
+UNOCONV_TIMEOUT = int(config.get('UNOCONV_TIMEOUT', 60))
 
 ADDRESS = config.get('SERVER', os.environ.get('UNOCONV_PORT_2002_TCP_ADDR', '127.0.0.1'))
 PORT = config.get('PORT', os.environ.get('UNOCONV_PORT_2002_TCP_PORT', '2002'))