[Checkins] SVN: zc.zkzeo/trunk/src/zc/zkzeo/ - Fixed bug in handling the monitor-server. The actuall address

[Jim Fulton]

Log message for revision 123781:
  - Fixed bug in handling the monitor-server. The actuall address
    setting was ignored.
  

Changed:
  U   zc.zkzeo/trunk/src/zc/zkzeo/README.txt
  U   zc.zkzeo/trunk/src/zc/zkzeo/runzeo.py

-=-
Modified: zc.zkzeo/trunk/src/zc/zkzeo/README.txt
===================================================================
--- zc.zkzeo/trunk/src/zc/zkzeo/README.txt	2011-12-12 16:22:18 UTC (rev 123780)
+++ zc.zkzeo/trunk/src/zc/zkzeo/README.txt	2011-12-12 18:23:03 UTC (rev 123781)
@@ -113,7 +113,7 @@
     >>> zk.print_tree('/databases/demo')
     /demo
       /127.0.0.1:64211
-        monitor = u'localhost:11976'
+        monitor = u'127.0.0.1:11976'
         pid = 5082
 
 Some notes on the monitor server:
@@ -228,6 +228,7 @@
     >>> handler.install()
 
     >>> [old_addr] = zk.get_children('/databases/demo')
+
     >>> stop().exception
 
     >>> wait_until(lambda : not client.is_connected())
@@ -268,7 +269,7 @@
     >>> print zk.export_tree('/databases/demo', ephemeral=True),
     /demo
       /127.0.0.1:56837
-        monitor = u'localhost:23265'
+        monitor = u'127.0.0.1:23265'
         pid = 88841
 
     >>> wait_until(db_from_config.storage.is_connected)
@@ -322,6 +323,12 @@
 Change History
 ==============
 
+0.1.3 (2011-12-12)
+------------------
+
+- Fixed bug in handling the monitor-server. The actuall address
+  setting was ignored.
+
 0.1.1 (2011-12-12)
 ------------------
 

Modified: zc.zkzeo/trunk/src/zc/zkzeo/runzeo.py
===================================================================
--- zc.zkzeo/trunk/src/zc/zkzeo/runzeo.py	2011-12-12 16:22:18 UTC (rev 123780)
+++ zc.zkzeo/trunk/src/zc/zkzeo/runzeo.py	2011-12-12 18:23:03 UTC (rev 123781)
@@ -38,9 +38,12 @@
             if self.options.monitor_server:
                 global zc
                 import zc.monitor
-                props['monitor'] = "%s:%s" % zc.monitor.start(
-                    self.options.monitor_server)
 
+                maddr = self.options.monitor_server.address
+                if isinstance(maddr, tuple) and maddr[1] is None:
+                    maddr = maddr[0], 0
+                props['monitor'] = "%s:%s" % zc.monitor.start(maddr)
+
             self.__zk.register_server(self.options.zkpath, addr, **props)
             if self.__testing is not None:
                 self.__testing()