Merge lp:~john-peterson/calibre/log into lp:calibre

[John Peterson]

Comment(s) exist at https://github.com/mirror/calibre/pull/11

Unmerged revisions

14270. By John Peterson on 2013-02-07

Adding missing exception message

14269. By John Peterson on 2013-02-07

Changing `calibre-parallel` output connection from file to pipe and always print its output

=== modified file 'src/calibre/ebooks/metadata/pdf.py'
--- src/calibre/ebooks/metadata/pdf.py	2013-01-30 08:54:26 +0000
+++ src/calibre/ebooks/metadata/pdf.py	2013-02-11 13:30:31 +0000
@@ -87,10 +87,6 @@
             prints(e.orig_tb)
             raise RuntimeError('Failed to run pdfinfo')
         info = res['result']
-        with open(res['stdout_stderr'], 'rb') as f:
-            raw = f.read().strip()
-            if raw:
-                prints(raw)
         if not info:
             raise ValueError('Could not read info dict from PDF')
         covpath = os.path.join(pdfpath, 'cover.jpg')

=== modified file 'src/calibre/ebooks/metadata/sources/identify.py'
--- src/calibre/ebooks/metadata/sources/identify.py	2012-12-15 18:54:14 +0000
+++ src/calibre/ebooks/metadata/sources/identify.py	2013-02-11 13:30:31 +0000
@@ -7,7 +7,7 @@
 __copyright__ = '2011, Kovid Goyal <[e-mail]>'
 __docformat__ = 'restructuredtext en'
 
-import time
+import time, traceback
 from datetime import datetime
 from Queue import Queue, Empty
 from threading import Thread
@@ -41,6 +41,7 @@
         try:
             self.plugin.identify(self.log, self.rq, self.abort, **self.kwargs)
         except:
+            traceback.print_exc()
             self.log.exception('Plugin', self.plugin.name, 'failed')
         self.plugin.dl_time_spent = time.time() - start
 

=== modified file 'src/calibre/ebooks/metadata/sources/worker.py'
--- src/calibre/ebooks/metadata/sources/worker.py	2012-04-12 09:50:24 +0000
+++ src/calibre/ebooks/metadata/sources/worker.py	2013-02-11 13:30:31 +0000
@@ -7,7 +7,7 @@
 __copyright__ = '2012, Kovid Goyal <[e-mail]>'
 __docformat__ = 'restructuredtext en'
 
-import os
+import os, traceback
 from threading import Event, Thread
 from Queue import Queue, Empty
 from io import BytesIO
@@ -68,7 +68,7 @@
                 results = identify(log, Event(), title=title, authors=authors,
                     identifiers=identifiers)
             except:
-                pass
+                traceback.print_exc()
             if results:
                 all_failed = False
                 mi = merge_result(mi, results[0], ensure_fields=ensure_fields)

=== modified file 'src/calibre/ebooks/mobi/tweak.py'
--- src/calibre/ebooks/mobi/tweak.py	2012-05-21 07:58:25 +0000
+++ src/calibre/ebooks/mobi/tweak.py	2013-02-11 13:30:31 +0000
@@ -69,7 +69,7 @@
                 return None
 
     return fork_job('calibre.ebooks.mobi.tweak', 'do_explode', args=(path,
-            dest), no_output=True)['result']
+            dest))['result']
 
 def set_cover(oeb):
     if 'cover' not in oeb.guide or oeb.metadata['cover']: return
@@ -96,7 +96,6 @@
         raise ValueError('No OPF file found in %s'%src_dir)
     opf = opf[0]
     # For debugging, uncomment the following line
-    # def fork_job(a, b, args=None, no_output=True): do_rebuild(*args)
-    fork_job('calibre.ebooks.mobi.tweak', 'do_rebuild', args=(opf, dest_path),
-            no_output=True)
+    # def fork_job(a, b, args=None): do_rebuild(*args)
+    fork_job('calibre.ebooks.mobi.tweak', 'do_rebuild', args=(opf, dest_path))
 

=== modified file 'src/calibre/ebooks/oeb/polish/container.py'
--- src/calibre/ebooks/oeb/polish/container.py	2013-02-10 12:14:33 +0000
+++ src/calibre/ebooks/oeb/polish/container.py	2013-02-11 13:30:31 +0000
@@ -534,7 +534,7 @@
         try:
             opf_path, obfuscated_fonts = fork_job(
             'calibre.ebooks.oeb.polish.container', 'do_explode',
-            args=(pathtoazw3, tdir), no_output=True)['result']
+            args=(pathtoazw3, tdir))['result']
         except WorkerError as e:
             log(e.orig_tb)
             raise InvalidMobi('Failed to explode MOBI')

=== modified file 'src/calibre/gui2/auto_add.py'
--- src/calibre/gui2/auto_add.py	2012-03-30 13:25:38 +0000
+++ src/calibre/gui2/auto_add.py	2013-02-11 13:30:31 +0000
@@ -78,7 +78,7 @@
             tdir = tempfile.mkdtemp(dir=self.tdir)
             try:
                 fork_job('calibre.ebooks.metadata.meta',
-                        'forked_read_metadata', (f, tdir), no_output=True)
+                        'forked_read_metadata', (f, tdir))
             except WorkerError as e:
                 prints('Failed to read metadata from:', fname)
                 prints(e.orig_tb)

=== modified file 'src/calibre/gui2/metadata/bulk_download.py'
--- src/calibre/gui2/metadata/bulk_download.py	2012-04-12 09:50:24 +0000
+++ src/calibre/gui2/metadata/bulk_download.py	2013-02-11 13:30:31 +0000
@@ -233,7 +233,7 @@
             try:
                 ret = fork_job('calibre.ebooks.metadata.sources.worker', 'main',
                         (do_identify, covers, metadata, ensure_fields, tdir),
-                        abort=abort, heartbeat=heartbeat, no_output=True)
+                        abort=abort, heartbeat=heartbeat)
             except WorkerError as e:
                 if e.orig_tb:
                     raise Exception('Failed to download metadata. Original '

=== modified file 'src/calibre/gui2/metadata/single_download.py'
--- src/calibre/gui2/metadata/single_download.py	2013-02-06 03:46:24 +0000
+++ src/calibre/gui2/metadata/single_download.py	2013-02-11 13:30:31 +0000
@@ -424,7 +424,7 @@
                 res = fork_job(
                         'calibre.ebooks.metadata.sources.worker',
                         'single_identify', (self.title, self.authors,
-                            self.identifiers), no_output=True, abort=self.abort)
+                            self.identifiers), abort=self.abort)
                 self.results, covers, caches, log_dump = res['result']
                 self.results = [OPF(BytesIO(r), basedir=os.getcwdu(),
                     populate_spine=False).to_book_metadata() for r in self.results]
@@ -601,8 +601,7 @@
                 res = fork_job('calibre.ebooks.metadata.sources.worker',
                     'single_covers',
                     (self.title, self.authors, self.identifiers, self.caches,
-                        tdir),
-                    no_output=True, abort=self.abort)
+                        tdir), abort=self.abort)
                 self.log.append_dump(res['result'])
             finally:
                 self.keep_going = False

=== modified file 'src/calibre/utils/ipc/launch.py'
--- src/calibre/utils/ipc/launch.py	2012-04-02 12:29:01 +0000
+++ src/calibre/utils/ipc/launch.py	2013-02-11 13:30:31 +0000
@@ -120,14 +120,12 @@
         if not hasattr(self, 'child'): return None
         return getattr(self.child, 'pid', None)
 
-    def close_log_file(self):
-        try:
-            self._file.close()
-        except:
-            pass
+    def print_output(self):
+        out, err = self.child.communicate()
+        print out, '\n', err
 
     def kill(self):
-        self.close_log_file()
+        self.print_output()
         try:
             if self.is_alive:
                 if iswindows:
@@ -192,12 +190,10 @@
             args['preexec_fn'] = partial(renice, niceness)
         ret = None
         if redirect_output:
-            self._file = PersistentTemporaryFile('_worker_redirect.log')
-            args['stdout'] = self._file._fd
+            args['stdout'] = subprocess.PIPE
             args['stderr'] = subprocess.STDOUT
             if iswindows:
                 args['stdin'] = subprocess.PIPE
-            ret = self._file.name
 
         if iswindows and 'stdin' not in args:
             # On windows when using the pythonw interpreter,
@@ -216,8 +212,4 @@
         if 'stdin' in args:
             self.child.stdin.close()
 
-        self.log_path = ret
-        return ret
-
-
 

=== modified file 'src/calibre/utils/ipc/simple_worker.py'
--- src/calibre/utils/ipc/simple_worker.py	2012-12-07 10:17:49 +0000
+++ src/calibre/utils/ipc/simple_worker.py	2013-02-11 13:30:31 +0000
@@ -84,7 +84,7 @@
     ans['result'] = cw.res['result']
 
 def fork_job(mod_name, func_name, args=(), kwargs={}, timeout=300, # seconds
-        cwd=None, priority='normal', env={}, no_output=False, heartbeat=None,
+        cwd=None, priority='normal', env={}, heartbeat=None,
         abort=None, module_is_source_code=False):
     '''
     Run a job in a worker process. A job is simply a function that will be
@@ -112,9 +112,6 @@
 
     :param env: Extra environment variables to set for the worker process
 
-    :param no_output: If True, the stdout and stderr of the worker process are
-    discarded
-
     :param heartbeat: If not None, it is used to check if the worker has hung,
     instead of a simple timeout. It must be a callable that takes no
     arguments and returns True or False. The worker will be assumed to have
@@ -132,7 +129,6 @@
     :return: A dictionary with the keys result and stdout_stderr. result is the
     return value of the function (it must be picklable). stdout_stderr is the
     path to a file that contains the stdout and stderr of the worker process.
-    If you set no_output=True, then this will not be present.
     '''
 
     ans = {'result':None, 'stdout_stderr':None}
@@ -162,13 +158,6 @@
         t = Thread(target=w.kill)
         t.daemon=True
         t.start()
-        if no_output:
-            try:
-                os.remove(w.log_path)
-            except:
-                pass
-    if not no_output:
-        ans['stdout_stderr'] = w.log_path
     return ans
 
 def compile_code(src):

=== modified file 'src/calibre/utils/serve_coffee.py'
--- src/calibre/utils/serve_coffee.py	2012-06-20 08:56:05 +0000
+++ src/calibre/utils/serve_coffee.py	2013-02-11 13:30:31 +0000
@@ -98,7 +98,7 @@
     except NameError:
         from calibre.utils.ipc.simple_worker import fork_job
         return fork_job('calibre.utils.serve_coffee', 'do_compile',
-                args=(raw,), no_output=True)['result']
+                args=(raw,))['result']
 
 class HTTPRequestHandler(SimpleHTTPRequestHandler): # {{{
     '''