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

[Guido van Rossum]

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

Modified Files:
	zdaemon.py 
Log Message:
Don't call governor() when killing.
Fix NameError in reportstatus().


=== ZODB3/zdaemon/zdaemon.py 1.13 => 1.14 ===
--- ZODB3/zdaemon/zdaemon.py:1.13	Tue Nov 12 14:53:58 2002
+++ ZODB3/zdaemon/zdaemon.py	Tue Nov 12 19:47:31 2002
@@ -574,9 +574,10 @@
         self.waitstatus = None
         if pid == self.appid:
             self.appid = 0
+            if not self.killing:
+                self.governor()
             self.killing = 0
             self.delay = 0
-            self.governor()
         if os.WIFEXITED(sts):
             es = os.WEXITSTATUS(sts)
             msg = "pid %d: exit status %s" % (pid, es)
@@ -592,7 +593,7 @@
             if hasattr(os, "WCOREDUMP"):
                 iscore = os.WCOREDUMP(sts)
             else:
-                iscore = s & 0x80
+                iscore = sts & 0x80
             if iscore:
                 msg += " (core dumped)"
             self.problem(msg)