X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rforking.py;h=f0e9354a0df4628fad5ef0093c08c652c43697ed;hb=1a001aafb9fefdbc003ee5ce49ca19d4f4f7e3ec;hp=4693f52979741235db3beb7fe4947e7ae6055823;hpb=7028dcb5fe31ccf6d348dca315154d719f3c481e;p=bookmarks_db.git

diff --git a/Robots/bkmk_rforking.py b/Robots/bkmk_rforking.py
index 4693f52..f0e9354 100644
--- a/Robots/bkmk_rforking.py
+++ b/Robots/bkmk_rforking.py
@@ -1,7 +1,7 @@
 """
    Forking robot
 
-   Written by BroytMann. Copyright (C) 2000-2007 PhiloSoft Design.
+   Written by Broytman. Copyright (C) 2000-2010 PhiloSoft Design.
 """
 
 
@@ -14,6 +14,9 @@ except ImportError:
 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() and errors from from the subprocess.
+sys.stderr = open("err.log", 'a')
 
 check_subp = None
 subp_pipe = None
@@ -29,7 +32,8 @@ def restart_subp(log):
    global check_subp, subp_pipe
    stop_subp(log)
 
-   check_subp = Subprocess("%s/Robots/bkmk_rforking_sub.py" % os.path.dirname(sys.argv[0]))
+   check_subp = Subprocess("%s/Robots/bkmk_rforking_sub.py" % os.path.dirname(sys.argv[0]),
+      control_stderr=True)
    subp_pipe = RecordFile(check_subp)
 
 
@@ -47,11 +51,12 @@ 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(60): # wait a minute
             new_b = pickle.loads(subp_pipe.read_record())
             for attr in ("error", "no_error",
                   "moved", "size", "md5", "real_title",
-                  "last_tested", "last_modified", "test_time", "icon"):
+                  "last_tested", "last_modified", "test_time",
+                  "icon", "icon_href"):
                if hasattr(new_b, attr):
                   setattr(bookmark, attr, getattr(new_b, attr))
          else:
@@ -60,6 +65,13 @@ class robot_forking(Robot):
 
          bookmark.parent = save_parent
 
+         while True:
+            error = check_subp.readPendingErrLine()
+            if not error:
+               break
+            sys.stderr.write("(subp) " + error)
+         sys.stderr.flush()
+
       except KeyboardInterrupt:
          return 0