X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rforking.py;h=117bf31913fba0b866217980ed58d85a04d56b97;hb=43c428bf639a603c34669f67989ff5343d2a02d7;hp=6250af91603cfb8e6125b049e900f33c3be0e9ef;hpb=c2ea4e82718b903aa123dd77490f36657383b0ca;p=bookmarks_db.git diff --git a/Robots/bkmk_rforking.py b/Robots/bkmk_rforking.py index 6250af9..117bf31 100644 --- a/Robots/bkmk_rforking.py +++ b/Robots/bkmk_rforking.py @@ -10,7 +10,8 @@ __license__ = "GNU GPL" __all__ = ['robot_forking'] -import sys, os +import os +import sys try: import cPickle as pickle @@ -23,11 +24,12 @@ from bkmk_objects import Robot # This is to catch 'close failed: [Errno 9] Bad file descriptor' message # from os.close() in Subprocess.die() and errors from the subprocess. -sys.stderr = open("err.log", 'a') +sys.stderr = open("err.log", 'at') check_subp = None subp_pipe = None + def stop_subp(log): global check_subp, subp_pipe if check_subp: @@ -35,19 +37,22 @@ def stop_subp(log): del check_subp del subp_pipe + 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) _set_subproc = True + class robot_forking(Robot): - subproc = 'urllib2' # Default subprocess + subproc = 'urllib' # Default subprocess def check_url(self, bookmark): global _set_subproc @@ -58,7 +63,9 @@ class robot_forking(Robot): subproc_attrs = [] for attr in dir(self): if attr.startswith('subproc_'): - subproc_attrs.append((attr[len('subproc_'):], getattr(self, attr))) + subproc_attrs.append( + (attr[len('subproc_'):], getattr(self, attr)) + ) if subproc_attrs: subproc += ':' + ':'.join( ['='.join((k, v)) for k, v in subproc_attrs] @@ -93,7 +100,7 @@ class robot_forking(Robot): error = check_subp.readPendingErrLine() if not error: break - sys.stderr.write("(subp) " + error) + sys.stderr.write("(subp) %s" % error) sys.stderr.flush() except KeyboardInterrupt: