Merge branch 'puma_sigterm' into 'master'

Send SIGINT instead of SIGQUIT to puma See merge request gitlab-org/gitlab!54446

Merge branch 'puma_sigterm' into 'master'
Send SIGINT instead of SIGQUIT to puma See merge request gitlab-org/gitlab!54446
bfd4206b · Stan Hu · b726602f · c440a8dd · bfd4206b · bfd4206b
Commit bfd4206b authored Feb 19, 2021 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

bin/actioncable bin/actioncable +1 -1

bin/web_puma bin/web_puma +1 -1

changelogs/unreleased/puma_sigint.yml changelogs/unreleased/puma_sigint.yml +5 -0

No files found.
--- a/bin/actioncable
+++ b/bin/actioncable
@@ -36,7 +36,7 @@ start_foreground()
 stop()
 {
  get_puma_pid
-  kill -QUIT "$(get_puma_pid)"
+  kill -INT "$(get_puma_pid)"
 }
 reload()

--- a/bin/web_puma
+++ b/bin/web_puma
@@ -36,7 +36,7 @@ start_foreground()
 stop()
 {
  get_puma_pid
-  kill -QUIT "$(get_puma_pid)"
+  kill -INT "$(get_puma_pid)"
 }
 reload()

--- a/changelogs/unreleased/puma_sigint.yml
+++ b/changelogs/unreleased/puma_sigint.yml
+---
+title: Send SIGINT instead of SIGQUIT to puma
+merge_request: 54446
+author: Jörg Behrmann @behrmann
+type: fixed