From 48912484be027aa0e691190bbf7abfd9ea14829b Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Wed, 16 Jun 2010 15:29:12 -0400 Subject: [PATCH] Fix Arbiter bugs --- gunicorn/arbiter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gunicorn/arbiter.py b/gunicorn/arbiter.py index 920b73ad..f932840b 100644 --- a/gunicorn/arbiter.py +++ b/gunicorn/arbiter.py @@ -65,10 +65,10 @@ class Arbiter(object): # get current path, try to use PWD env first try: - a = os.stat(os.environ('PWD')) + a = os.stat(os.environ['PWD']) b = os.stat(os.getcwd()) if a.ino == b.ino and a.dev == b.dev: - cwd = os.environ('PWD') + cwd = os.environ['PWD'] else: cwd = os.getcwd() except: @@ -295,7 +295,7 @@ class Arbiter(object): if not graceful: sig = signal.SIGTERM limit = time.time() + self.timeout - while self.WORKERS or time.time() > limit: + while self.WORKERS and time.time() < limit: self.kill_workers(sig) time.sleep(0.1) self.reap_workers()