diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2010-02-08 21:18:15 (GMT) |
---|---|---|
committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2010-02-08 21:18:15 (GMT) |
commit | cfc43e9435e4f7428f6dfb163ab8f3846dd3af28 (patch) | |
tree | 6aa71335fe437e7a26a4876c0ed129c67d01c52d /Lib/logging/config.py | |
parent | dde96e6dd6222e37746563930ff4bf3b1321f10e (diff) | |
download | cpython-cfc43e9435e4f7428f6dfb163ab8f3846dd3af28.zip cpython-cfc43e9435e4f7428f6dfb163ab8f3846dd3af28.tar.gz cpython-cfc43e9435e4f7428f6dfb163ab8f3846dd3af28.tar.bz2 |
logging: gingerly re-enabling skipped tests after improving thread sync code in configurator.
Diffstat (limited to 'Lib/logging/config.py')
-rw-r--r-- | Lib/logging/config.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py index fdf4397..1438388 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -803,6 +803,8 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT): raise except: traceback.print_exc() + if self.server.ready: + self.server.ready.set() except socket.error, e: if not isinstance(e.args, tuple): raise @@ -819,12 +821,13 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT): allow_reuse_address = 1 def __init__(self, host='localhost', port=DEFAULT_LOGGING_CONFIG_PORT, - handler=None): + handler=None, ready=None): ThreadingTCPServer.__init__(self, (host, port), handler) logging._acquireLock() self.abort = 0 logging._releaseLock() self.timeout = 1 + self.ready = ready def serve_until_stopped(self): import select @@ -849,7 +852,8 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT): self.ready = threading.Event() def run(self): - server = self.rcvr(port=self.port, handler=self.hdlr) + server = self.rcvr(port=self.port, handler=self.hdlr, + ready=self.ready) self.ready.set() global _listener logging._acquireLock() |