[Checkins] SVN: zc.ngi/trunk/src/zc/ngi/async fixing a wrong logging message

[Adam Groszer]

Log message for revision 108430:
  fixing a wrong logging message

Changed:
  U   zc.ngi/trunk/src/zc/ngi/async-udp.test
  U   zc.ngi/trunk/src/zc/ngi/async.py
  U   zc.ngi/trunk/src/zc/ngi/async.txt

-=-
Modified: zc.ngi/trunk/src/zc/ngi/async-udp.test
===================================================================
--- zc.ngi/trunk/src/zc/ngi/async-udp.test	2010-01-24 11:01:14 UTC (rev 108429)
+++ zc.ngi/trunk/src/zc/ngi/async-udp.test	2010-01-24 12:25:53 UTC (rev 108430)
@@ -8,6 +8,7 @@
     ...     addr = '127.0.0.1'
     ... else:
     ...     addr = ''
+    >>> addrText = repr((addr, 9644))
 
 
     >>> zc.ngi.async.udp((addr, 9644), 'test')
@@ -15,9 +16,21 @@
     >>> def handler(addr, message):
     ...     print message
 
+    >>> import zope.testing.loggingsupport, logging
+    >>> loghandler = zope.testing.loggingsupport.InstalledHandler(
+    ...                  None, level=logging.INFO)
+
     >>> listener = zc.ngi.async.udp_listener((addr, 9644), handler)
     >>> time.sleep(0.1)
 
+    >>> logcontent = str(loghandler)
+    >>> print logcontent # doctest: +ELLIPSIS
+    zc.ngi.async.udpserver INFO
+      listening on udp ('...', 9644)
+
+    >>> addrText in logcontent
+    True
+
     >>> zc.ngi.async.udp((addr, 9644), 'test'); time.sleep(0.1)
     test
 

Modified: zc.ngi/trunk/src/zc/ngi/async.py
===================================================================
--- zc.ngi/trunk/src/zc/ngi/async.py	2010-01-24 11:01:14 UTC (rev 108429)
+++ zc.ngi/trunk/src/zc/ngi/async.py	2010-01-24 12:25:53 UTC (rev 108430)
@@ -368,7 +368,7 @@
         try:
             if not is_win32:
                 self.set_reuse_addr()
-            self.logger.info("listening on %r", self.addr)
+            self.logger.info("listening on %r", addr)
             self.bind(addr)
             self.listen(255)
         except socket.error:
@@ -441,7 +441,7 @@
             self.create_socket(family, socket.SOCK_DGRAM)
             if not is_win32:
                 self.set_reuse_addr()
-            self.logger.info("listening on udp %r", self.addr)
+            self.logger.info("listening on udp %r", addr)
             self.bind(addr)
         except socket.error:
             self.close()

Modified: zc.ngi/trunk/src/zc/ngi/async.txt
===================================================================
--- zc.ngi/trunk/src/zc/ngi/async.txt	2010-01-24 11:01:14 UTC (rev 108429)
+++ zc.ngi/trunk/src/zc/ngi/async.txt	2010-01-24 12:25:53 UTC (rev 108430)
@@ -182,3 +182,36 @@
 
    The server log was printed. Note that we see the Error that we
    requested above.
+
+Check logging
+=============
+
+    >>> import sys
+    >>> import time
+
+    >>> if sys.platform == 'win32':
+    ...     addr = '127.0.0.1'
+    ... else:
+    ...     addr = ''
+    >>> addrText = repr((addr, 9644))
+
+
+    >>> def handler(addr, message):
+    ...     print message
+
+    >>> loghandler = zope.testing.loggingsupport.InstalledHandler(
+    ...                  None, level=logging.INFO)
+
+    >>> listener = zc.ngi.async.listener((addr, 9644), handler)
+    >>> time.sleep(0.1)
+
+    >>> logcontent = str(loghandler)
+    >>> print logcontent # doctest: +ELLIPSIS
+    zc.ngi.async.server INFO
+      listening on ('...', 9644)
+
+    >>> addrText in logcontent
+    True
+
+    >>> listener.close()
+    >>> time.sleep(0.1)