Fix Arbiter bugs

This commit is contained in:
Paul Smith 2010-06-16 15:29:12 -04:00
parent ebca25dddb
commit 48912484be

View File

@ -65,10 +65,10 @@ class Arbiter(object):
# get current path, try to use PWD env first # get current path, try to use PWD env first
try: try:
a = os.stat(os.environ('PWD')) a = os.stat(os.environ['PWD'])
b = os.stat(os.getcwd()) b = os.stat(os.getcwd())
if a.ino == b.ino and a.dev == b.dev: if a.ino == b.ino and a.dev == b.dev:
cwd = os.environ('PWD') cwd = os.environ['PWD']
else: else:
cwd = os.getcwd() cwd = os.getcwd()
except: except:
@ -295,7 +295,7 @@ class Arbiter(object):
if not graceful: if not graceful:
sig = signal.SIGTERM sig = signal.SIGTERM
limit = time.time() + self.timeout limit = time.time() + self.timeout
while self.WORKERS or time.time() > limit: while self.WORKERS and time.time() < limit:
self.kill_workers(sig) self.kill_workers(sig)
time.sleep(0.1) time.sleep(0.1)
self.reap_workers() self.reap_workers()