jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove the worker id. just use pid as ref.

Browse Source
This commit is contained in:
benoitc 2010-03-01 09:11:39 +01:00
parent 6deeeecc80
commit 5f11fd024b
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gunicorn/arbiter.py
View File

@ -400,14 +400,10 @@ class Arbiter(object):
This is where a worker process leaves the main loop This is where a worker process leaves the main loop
of the master process. of the master process.
""" """
workers = set(w.id for w in self.WORKERS.values())
for i in range(self.num_workers):
if i in workers:
continue
for i in range(self.num_workers - len(self.WORKERS.keys())):
self.worker_age += 1 self.worker_age += 1
worker = Worker(i, self.worker_age, self.pid, worker = Worker(self.worker_age, self.pid, self.LISTENER, self.app,
self.LISTENER, self.app,
self.timeout/2.0, self.conf) self.timeout/2.0, self.conf)
self.conf.before_fork(self, worker) self.conf.before_fork(self, worker)
pid = os.fork() pid = os.fork()
@ -420,7 +416,7 @@ class Arbiter(object):
try: try:
util._setproctitle("worker [%s]" % self.proc_name) util._setproctitle("worker [%s]" % self.proc_name)
self.log.debug("Booting worker: %s (age: %s)" % ( self.log.debug("Booting worker: %s (age: %s)" % (
i, self.worker_age)) worker_pid, self.worker_age))
self.conf.after_fork(self, worker) self.conf.after_fork(self, worker)
worker.run() worker.run()
sys.exit(0) sys.exit(0)
@ -430,7 +426,7 @@ class Arbiter(object):
self.log.exception("Exception in worker process.") self.log.exception("Exception in worker process.")
sys.exit(-1) sys.exit(-1)
finally: finally:
self.log.info("Worker exiting: %s (pid: %s)" % (i, worker_pid)) self.log.info("Worker exiting (pid: %s)" % worker_pid)
try: try:
worker.tmp.close() worker.tmp.close()
os.unlink(worker.tmpname) os.unlink(worker.tmpname)

2
gunicorn/config.py
View File

@ -27,7 +27,7 @@ class Config(object):
group=None, group=None,
after_fork=lambda server, worker: server.log.info( after_fork=lambda server, worker: server.log.info(
"Worker spawned: %s (pid: %s)" % (worker.id, worker.pid)), "Worker spawned (pid: %s)" % worker.pid),
before_fork=lambda server, worker: True, before_fork=lambda server, worker: True,

5
gunicorn/worker.py
View File

@ -27,9 +27,8 @@ class Worker(object):
PIPE = [] PIPE = []
def __init__(self, workerid, age, ppid, socket, app, timeout, conf): def __init__(self, age, ppid, socket, app, timeout, conf):
self.nr = 0 self.nr = 0
self.id = workerid
self.age = age self.age = age
self.ppid = ppid self.ppid = ppid
self.debug = conf['debug'] self.debug = conf['debug']
@ -46,7 +45,7 @@ class Worker(object):
self.address = self.socket.getsockname() self.address = self.socket.getsockname()
def __str__(self): def __str__(self):
return "<Worker %s>" % self.id return "<Worker %s>" % os.getpid()
@property @property
def pid(self): def pid(self):