From ebca25dddbb5a86f1fd28b28132d7b1abd12e70e Mon Sep 17 00:00:00 2001 From: benoitc Date: Wed, 16 Jun 2010 11:38:35 +0200 Subject: [PATCH] make sure conf is available when spawning workers. Also since run already manage_workers, no need to run this function in reload. --- gunicorn/arbiter.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gunicorn/arbiter.py b/gunicorn/arbiter.py index aa63df3f..920b73ad 100644 --- a/gunicorn/arbiter.py +++ b/gunicorn/arbiter.py @@ -321,18 +321,16 @@ class Arbiter(object): def reload(self): # reload conf self.app.reload() + self.setup(self.app) - # spawn new workers + # spawn new workers with new app & conf for i in range(self.app.cfg.workers): self.spawn_worker() # unlink pidfile if self.pidfile is not None: self.pidfile.unlink() - - self.setup(self.app) - self.manage_workers() - + return self.run() def murder_workers(self):