[Zodb-checkins] CVS: ZODB3/zdaemon - Daemon.py:1.11.8.2
Guido van Rossum
guido@python.org
Thu, 17 Oct 2002 18:12:02 -0400
Update of /cvs-repository/ZODB3/zdaemon
In directory cvs.zope.org:/tmp/cvs-serv665
Modified Files:
Tag: ZODB3-3_1-branch
Daemon.py
Log Message:
Oops, withdraw a feature that wasn't ready to be committed.
=== ZODB3/zdaemon/Daemon.py 1.11.8.1 => 1.11.8.2 ===
--- ZODB3/zdaemon/Daemon.py:1.11.8.1 Thu Oct 17 18:10:48 2002
+++ ZODB3/zdaemon/Daemon.py Thu Oct 17 18:12:02 2002
@@ -16,12 +16,6 @@
from ZDaemonLogging import pstamp
import zLOG
-# If zdaemon finds that it is continuously respawning more than 10
-# times in 2 minutes, it will assume that there is an error, log a
-# PANIC level message, and exit.
-RESPAWN_TIME = 120 # 2 minutes
-RESPAWN_LIMIT = 10 # 10 times
-
pyth = sys.executable
class DieNow(Exception):
@@ -50,17 +44,7 @@
if not os.environ.has_key('Z_DEBUG_MODE'):
detach() # detach from the controlling terminal
- starttimes = [] # for RESPAWN_LIMIT
while 1:
- # Give up if respawning too often
- starttimes.append(time.time())
- if len(starttimes) > RESPAWN_LIMIT:
- del starttimes[0]
- if starttimes[-1] - starttimes[0] < RESPAWN_TIME:
- pstamp('Respawning more than %d times in %d seconds. Quit.' %
- (RESPAWN_LIMIT, RESPAWN_TIME), zLOG.PANIC)
- sys.exit(1)
- del starttimes[0]
try:
pid = os.fork()
if pid: