[Zodb-checkins] SVN: zdaemon/trunk/src/zdaemon/zd Cleaned up plumbing of stop-timeout

[jim]

Log message for revision 126591:
  Cleaned up plumbing of stop-timeout

Changed:
  U   zdaemon/trunk/src/zdaemon/zdoptions.py
  U   zdaemon/trunk/src/zdaemon/zdrun.py

-=-
Modified: zdaemon/trunk/src/zdaemon/zdoptions.py
===================================================================
--- zdaemon/trunk/src/zdaemon/zdoptions.py	2012-06-04 21:28:54 UTC (rev 126590)
+++ zdaemon/trunk/src/zdaemon/zdoptions.py	2012-06-05 13:28:57 UTC (rev 126591)
@@ -389,8 +389,6 @@
         ZDOptions.__init__(self)
         self.add("backofflimit", "runner.backoff_limit",
                  "b:", "backoff-limit=", int, default=10)
-        self.add("stoptimeut", "runner.stop_timeout",
-                 "T:", "stop-timeout=", int, default=300)
         self.add("daemon", "runner.daemon", "d", "daemon", flag=1, default=1)
         self.add("forever", "runner.forever", "f", "forever",
                  flag=1, default=0)

Modified: zdaemon/trunk/src/zdaemon/zdrun.py
===================================================================
--- zdaemon/trunk/src/zdaemon/zdrun.py	2012-06-04 21:28:54 UTC (rev 126590)
+++ zdaemon/trunk/src/zdaemon/zdrun.py	2012-06-05 13:28:57 UTC (rev 126591)
@@ -99,6 +99,7 @@
                  handler=self.set_schemafile)
         self.add("transcript", "runner.transcript", "t:", "transcript=",
                  default="/dev/null")
+        self.add("stoptimeut", "runner.stop_timeout")
 
     def set_schemafile(self, file):
         self.schemafile = file