Mark the error output from the subprocess with a prefix.

[bookmarks_db.git] / Robots / bkmk_rforking.py

diff --git a/Robots/bkmk_rforking.py b/Robots/bkmk_rforking.py
index 4693f52979741235db3beb7fe4947e7ae6055823..3ce798b407002ed75db7abe3dff73ac8fc56785b 100644 (file)
--- a/Robots/bkmk_rforking.py
+++ b/Robots/bkmk_rforking.py
@@ -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().
+sys.stderr = open("err.log", 'w')
 
 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)
 
 
@@ -60,6 +64,12 @@ class robot_forking(Robot):
 
          bookmark.parent = save_parent
 
+         while True:
+            error = check_subp.readPendingErrLine()
+            if not error:
+               break
+            sys.stderr.write("(subp) " + error)
+
       except KeyboardInterrupt:
          return 0