Attachment 1452469 Details for Bug 1592152 – 0001-handle-HaltServer-in-manage_workers.patch

[patch] 0001-handle-HaltServer-in-manage_workers.patch

file_1592152.txt (text/plain), 2.29 KB, created by Dan Callaghan on 2018-06-17 22:42:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Callaghan

Created: 2018-06-17 22:42:28 UTC

Size: 2.29 KB

patch

obsolete

>From cc3b78d89eaebbdc1b13aae781dd97be426d39c1 Mon Sep 17 00:00:00 2001
>From: Dan Callaghan <dcallagh@redhat.com>
>Date: Tue, 11 Aug 2015 17:08:03 +1000
>Subject: [PATCH] handle HaltServer in manage_workers
>
>---
> gunicorn/arbiter.py | 36 ++++++++++++++++++------------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
>
>diff --git a/gunicorn/arbiter.py b/gunicorn/arbiter.py
>index b48e5b7..067d0b3 100644
>--- a/gunicorn/arbiter.py
>+++ b/gunicorn/arbiter.py
>@@ -172,9 +172,9 @@ def run(self):
>         self.start()
>         util._setproctitle("master [%s]" % self.proc_name)
> 
>-        self.manage_workers()
>-        while True:
>-            try:
>+        try:
>+            self.manage_workers()
>+            while True:
>                 self.reap_workers()
>                 sig = self.SIG_QUEUE.pop(0) if len(self.SIG_QUEUE) else None
>                 if sig is None:
>@@ -195,21 +195,21 @@ def run(self):
>                 self.log.info("Handling signal: %s", signame)
>                 handler()
>                 self.wakeup()
>-            except StopIteration:
>-                self.halt()
>-            except KeyboardInterrupt:
>-                self.halt()
>-            except HaltServer as inst:
>-                self.halt(reason=inst.reason, exit_status=inst.exit_status)
>-            except SystemExit:
>-                raise
>-            except Exception:
>-                self.log.info("Unhandled exception in main loop:\n%s",
>-                            traceback.format_exc())
>-                self.stop(False)
>-                if self.pidfile is not None:
>-                    self.pidfile.unlink()
>-                sys.exit(-1)
>+        except StopIteration:
>+            self.halt()
>+        except KeyboardInterrupt:
>+            self.halt()
>+        except HaltServer as inst:
>+            self.halt(reason=inst.reason, exit_status=inst.exit_status)
>+        except SystemExit:
>+            raise
>+        except Exception:
>+            self.log.info("Unhandled exception in main loop:\n%s",
>+                        traceback.format_exc())
>+            self.stop(False)
>+            if self.pidfile is not None:
>+                self.pidfile.unlink()
>+            sys.exit(-1)
> 
>     def handle_chld(self, sig, frame):
>         "SIGCHLD handling"
>-- 
>2.14.4

Actions: View | Diff

Attachments on bug 1592152: 1452469