mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merged revisions 80712,81651 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80712 | vinay.sajip | 2010-05-03 10:11:53 -0500 (Mon, 03 May 2010) | 1 line

  Issue #8576: logging updated to remove usage of find_unused_port().
........
  r81651 | vinay.sajip | 2010-06-02 05:05:31 -0500 (Wed, 02 Jun 2010) | 1 line

  Logging: improved error reporting for BaseConfigurator.resolve().
........
This commit is contained in:
Benjamin Peterson 2010-06-27 20:54:28 +00:00
parent 28df4df079
commit a82addb5f3
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/logging/config.py
View file

@ -386,15 +386,21 @@ class BaseConfigurator(object):
""" """
name = s.split('.') name = s.split('.')
used = name.pop(0) used = name.pop(0)
found = self.importer(used) try:
for frag in name: found = self.importer(used)
used += '.' + frag for frag in name:
try: used += '.' + frag
found = getattr(found, frag) try:
except AttributeError: found = getattr(found, frag)
self.importer(used) except AttributeError:
found = getattr(found, frag) self.importer(used)
return found found = getattr(found, frag)
return found
except ImportError:
e, tb = sys.exc_info()[1:]
v = ValueError('Cannot resolve %r: %s' % (s, e))
v.__cause__, v.__traceback__ = e, tb
raise v
def ext_convert(self, value): def ext_convert(self, value):
"""Default converter for the ext:// protocol.""" """Default converter for the ext:// protocol."""
@ -873,6 +879,8 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT):
def run(self): def run(self):
server = self.rcvr(port=self.port, handler=self.hdlr, server = self.rcvr(port=self.port, handler=self.hdlr,
ready=self.ready) ready=self.ready)
if self.port == 0:
self.port = server.server_address[1]
self.ready.set() self.ready.set()
global _listener global _listener
logging._acquireLock() logging._acquireLock()

2
Lib/test/test_logging.py
View file

@ -1670,6 +1670,8 @@ class ConfigDictTest(BaseTest):
t = logging.config.listen(port) t = logging.config.listen(port)
t.start() t.start()
t.ready.wait() t.ready.wait()
# Now get the port allocated
port = t.port
t.ready.clear() t.ready.clear()
try: try:
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)