X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rforking.py;h=f0e9354a0df4628fad5ef0093c08c652c43697ed;hb=8bc6571d6eaba3a72ecb543c0fe9b95dbea31634;hp=d3d33511aff322e2a148c48e8f57e0e162cf9d68;hpb=780df49722c299d6bfa58765ef13659b765f1354;p=bookmarks_db.git diff --git a/Robots/bkmk_rforking.py b/Robots/bkmk_rforking.py index d3d3351..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. """ @@ -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,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: @@ -68,7 +69,8 @@ class robot_forking(Robot): error = check_subp.readPendingErrLine() if not error: break - sys.stderr.write(error) + sys.stderr.write("(subp) " + error) + sys.stderr.flush() except KeyboardInterrupt: return 0