Skip to content

Commit

Permalink
fix: the worker_abort hook interrupted after executing part
Browse files Browse the repository at this point in the history
  • Loading branch information
bingyun123 authored and Zhang Yunfeng committed Jan 6, 2025
1 parent bacbf8a commit 73ae038
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gunicorn/arbiter.py
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,8 @@ def murder_workers(self):

if not worker.aborted:
self.log.critical("WORKER TIMEOUT (pid:%s)", pid)
worker.aborted = True
self.kill_worker(pid, signal.SIGABRT)
worker.aborted = True
else:
self.kill_worker(pid, signal.SIGKILL)

Expand Down
3 changes: 2 additions & 1 deletion gunicorn/workers/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,9 @@ def handle_quit(self, sig, frame):
sys.exit(0)

def handle_abort(self, sig, frame):
self.alive = False
self.cfg.worker_abort(self)
self.alive = False
time.sleep(0.1)
sys.exit(1)

def handle_error(self, req, client, addr, exc):
Expand Down

0 comments on commit 73ae038

Please sign in to comment.