[Zope-Checkins] SVN: Zope/trunk/src/Zope2/Startup/zopectl.py restore ability to set sockname from command line

[Chris Withers]

Log message for revision 115616:
  restore ability to set sockname from command line

Changed:
  U   Zope/trunk/src/Zope2/Startup/zopectl.py

-=-
Modified: Zope/trunk/src/Zope2/Startup/zopectl.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/zopectl.py	2010-08-10 06:58:11 UTC (rev 115615)
+++ Zope/trunk/src/Zope2/Startup/zopectl.py	2010-08-10 07:10:01 UTC (rev 115616)
@@ -122,6 +122,10 @@
     # the command line option can set this.
     program = None
     
+    # this indicates that no explict socket name has been provided.
+    # the command line option can set this.
+    sockname = None
+    
     # XXX Suppress using Zope's <eventlog> section to avoid using the
     # same logging for zdctl as for the Zope appserver.  There still
     # needs to be a way to set a logfile for zdctl.
@@ -178,7 +182,10 @@
             self.program = config.runner.program
         else:
             self.program = [os.path.join(self.directory, "bin", "runzope")]
-        if config.runner and config.runner.socket_name:
+        if self.sockname:
+            # set by command line option
+            pass
+        elif config.runner and config.runner.socket_name:
             self.sockname = config.runner.socket_name
         else:
             self.sockname = os.path.join(self.clienthome, "zopectlsock")