[Checkins] SVN: Sandbox/J1m/resumelb/src/zc/resumelb/ Workers use their addresses as their reprs.
Jim Fulton
jim at zope.com
Sun Mar 4 14:15:25 UTC 2012
Log message for revision 124505:
Workers use their addresses as their reprs.
Changed:
U Sandbox/J1m/resumelb/src/zc/resumelb/lb.py
U Sandbox/J1m/resumelb/src/zc/resumelb/lb.test
U Sandbox/J1m/resumelb/src/zc/resumelb/tests.py
-=-
Modified: Sandbox/J1m/resumelb/src/zc/resumelb/lb.py
===================================================================
--- Sandbox/J1m/resumelb/src/zc/resumelb/lb.py 2012-03-04 14:03:21 UTC (rev 124504)
+++ Sandbox/J1m/resumelb/src/zc/resumelb/lb.py 2012-03-04 14:15:24 UTC (rev 124505)
@@ -226,6 +226,7 @@
def __init__(self, pool, socket, addr):
self.pool = pool
self.nrequest = 0
+ self.__name__ = '%s:%s' % addr
readers = self.connected(socket, addr)
@@ -242,7 +243,7 @@
readers[rno](data)
def __repr__(self):
- return "worker-%s" % id(self)
+ return self.__name__
def handle(self, rclass, env, start_response):
logger.debug('handled by %s', self.addr)
Modified: Sandbox/J1m/resumelb/src/zc/resumelb/lb.test
===================================================================
--- Sandbox/J1m/resumelb/src/zc/resumelb/lb.test 2012-03-04 14:03:21 UTC (rev 124504)
+++ Sandbox/J1m/resumelb/src/zc/resumelb/lb.test 2012-03-04 14:15:24 UTC (rev 124505)
@@ -206,6 +206,19 @@
>>> sum(worker.backlog for worker in lb.pool.workers)
0
+Worker reprs
+============
+
+Workers use their addresses as their reprs.
+
+ >>> print lb.pool
+ Request classes:
+ h1.com: 127.0.0.1:65027(10.0,0)
+ h2.com: 127.0.0.1:65028(10.0,0)
+ Backlogs:
+ 0: [127.0.0.1:65028, 127.0.0.1:65027]
+
+
Worker disconnection
====================
Modified: Sandbox/J1m/resumelb/src/zc/resumelb/tests.py
===================================================================
--- Sandbox/J1m/resumelb/src/zc/resumelb/tests.py 2012-03-04 14:03:21 UTC (rev 124504)
+++ Sandbox/J1m/resumelb/src/zc/resumelb/tests.py 2012-03-04 14:15:24 UTC (rev 124505)
@@ -92,7 +92,11 @@
def test_suite():
return unittest.TestSuite((
manuel.testing.TestSuite(
- manuel.doctest.Manuel() + manuel.capture.Manuel(),
+ manuel.doctest.Manuel(
+ checker = zope.testing.renormalizing.OutputChecker([
+ (re.compile(r'127.0.0.1:\d+'), '127.0.0.1:0'),
+ ])
+ ) + manuel.capture.Manuel(),
'lb.test', 'pool.test', 'worker.test',
setUp=setUp, tearDown=zope.testing.setupstack.tearDown),
manuel.testing.TestSuite(
More information about the checkins
mailing list