]> git.phdru.name Git - bookmarks_db.git/blobdiff - Robots/bkmk_rforking.py
Always log guessed charset even if it's utf-8.
[bookmarks_db.git] / Robots / bkmk_rforking.py
index 3ce798b407002ed75db7abe3dff73ac8fc56785b..7c6961b5b63c800ad36db1be4fbed16413e92470 100644 (file)
@@ -15,8 +15,8 @@ import sys, os
 from subproc import Subprocess, RecordFile
 
 # This is to catch 'close failed: [Errno 9] Bad file descriptor' message
-# from os.close() in Subprocess.die().
-sys.stderr = open("err.log", 'w')
+# from os.close() in Subprocess.die() and errors from from the subprocess.
+sys.stderr = open("err.log", 'a')
 
 check_subp = None
 subp_pipe = None
@@ -51,7 +51,7 @@ class robot_forking(Robot):
          bookmark.tempfname = self.tempfname
          subp_pipe.write_record(pickle.dumps(bookmark))
 
-         if check_subp.waitForPendingChar(900): # wait 15 minutes
+         if check_subp.waitForPendingChar(300): # wait 5 minutes
             new_b = pickle.loads(subp_pipe.read_record())
             for attr in ("error", "no_error",
                   "moved", "size", "md5", "real_title",
@@ -69,6 +69,7 @@ class robot_forking(Robot):
             if not error:
                break
             sys.stderr.write("(subp) " + error)
+         sys.stderr.flush()
 
       except KeyboardInterrupt:
          return 0