diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 98554712a7..e109c082c8 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -2,7 +2,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __appname__ = 'calibre' -__version__ = '0.4.86' +__version__ = '0.4.87' __author__ = "Kovid Goyal " ''' Various run time constants. diff --git a/src/calibre/parallel.py b/src/calibre/parallel.py index c8b8cd029f..6b19d7ba49 100644 --- a/src/calibre/parallel.py +++ b/src/calibre/parallel.py @@ -484,9 +484,9 @@ class Overseer(object): self.terminate() self.job.exception = ControlError('Worker sent invalid msg: %s'%repr(msg)) return - if not self.worker_status.is_alive() or time.time() - self.last_report > 180: + if not self.worker_status.is_alive() or time.time() - self.last_report > 380: self.terminate() - self.job.exception = ControlError('Worker process died unexpectedly with returncode: %s'%str(self.process.returncode)) + self.job.exception = ControlError('Worker process died unexpectedly') return class JobKilled(Exception):