[Zodb-checkins] CVS: ZODB3/zdaemon - zdrun.py:1.8

Guido van Rossum guido@python.org
Wed, 22 Jan 2003 18:21:41 -0500


Update of /cvs-repository/ZODB3/zdaemon
In directory cvs.zope.org:/tmp/cvs-serv27571

Modified Files:
	zdrun.py 
Log Message:
Don't exit when the subprocess exits with one of the special exit
status values due to a kill or restart.


=== ZODB3/zdaemon/zdrun.py 1.7 => 1.8 ===
--- ZODB3/zdaemon/zdrun.py:1.7	Wed Jan 22 16:22:56 2003
+++ ZODB3/zdaemon/zdrun.py	Wed Jan 22 18:21:37 2003
@@ -401,13 +401,14 @@
             msg = "unknown " + msg
             warn(msg)
         else:
-            if self.killing:
+            killing = self.killing
+            if killing:
                 self.killing = 0
                 self.delay = 0
             else:
                 self.governor()
             self.proc.setstatus(sts)
-            if es in self.options.exitcodes:
+            if es in self.options.exitcodes and not killing:
                 msg = msg + "; exiting now"
                 info(msg)
                 sys.exit(es)