From 5bb0734532e844022018a450b5938e2f9a49e3c7 Mon Sep 17 00:00:00 2001 From: benoitc Date: Thu, 11 Mar 2010 14:29:20 +0100 Subject: [PATCH] put creation of worker in its own class so we can pass custom workers to it. --- gunicorn/arbiter.py | 7 +++++-- gunicorn/worker.py | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gunicorn/arbiter.py b/gunicorn/arbiter.py index 24a2f46a..9c223a71 100644 --- a/gunicorn/arbiter.py +++ b/gunicorn/arbiter.py @@ -344,6 +344,9 @@ class Arbiter(object): if worker.age < age: pid, age = wpid, worker.age self.kill_worker(pid, signal.SIGQUIT) + + def init_worker(self, worker_age, pid, listener, app, timeout, conf): + return Worker(worker_age, pid, listener, app, timeout, conf) def spawn_workers(self): """\ @@ -355,8 +358,8 @@ class Arbiter(object): for i in range(self.num_workers - len(self.WORKERS.keys())): self.worker_age += 1 - worker = Worker(self.worker_age, self.pid, self.LISTENER, self.app, - self.timeout/2.0, self.conf) + worker = self.init_worker(self.worker_age, self.pid, self.LISTENER, + self.app, self.timeout/2.0, self.conf) self.conf.before_fork(self, worker) pid = os.fork() if pid != 0: diff --git a/gunicorn/worker.py b/gunicorn/worker.py index ccfc7e8b..d0aee6e0 100644 --- a/gunicorn/worker.py +++ b/gunicorn/worker.py @@ -93,7 +93,6 @@ class Worker(object): util.close_on_exec(self.socket) util.close_on_exec(self.fd) self.init_signals() - def accept(self): try: