From c565130b3505bbd1418f1494d74c4ba476654f44 Mon Sep 17 00:00:00 2001
From: Christian Adams <chadams@redhat.com>
Date: Fri, 1 May 2020 12:23:10 -0400
Subject: [PATCH] TERM rsyslogd instead of KILL for more graceful shutdown

---
 installer/roles/image_build/files/supervisor.conf      | 2 +-
 installer/roles/kubernetes/templates/supervisor.yml.j2 | 2 +-
 tools/docker-compose/supervisor.conf                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/installer/roles/image_build/files/supervisor.conf b/installer/roles/image_build/files/supervisor.conf
index 73dc7d14c2..a38ecdfce4 100644
--- a/installer/roles/image_build/files/supervisor.conf
+++ b/installer/roles/image_build/files/supervisor.conf
@@ -51,7 +51,7 @@ command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslo
 autostart = true
 autorestart = true
 stopwaitsecs = 5
-stopsignal=KILL
+stopsignal=TERM
 stopasgroup=true
 killasgroup=true
 redirect_stderr=true
diff --git a/installer/roles/kubernetes/templates/supervisor.yml.j2 b/installer/roles/kubernetes/templates/supervisor.yml.j2
index 99f42d30c1..ec62019743 100644
--- a/installer/roles/kubernetes/templates/supervisor.yml.j2
+++ b/installer/roles/kubernetes/templates/supervisor.yml.j2
@@ -58,7 +58,7 @@ data:
     autostart = true
     autorestart = true
     stopwaitsecs = 5
-    stopsignal=KILL
+    stopsignal=TERM
     stopasgroup=true
     killasgroup=true
     redirect_stderr=true
diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf
index b70fed413d..81731bb7a3 100644
--- a/tools/docker-compose/supervisor.conf
+++ b/tools/docker-compose/supervisor.conf
@@ -76,7 +76,7 @@ command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslo
 autostart = true
 autorestart = true
 stopwaitsecs = 5
-stopsignal=KILL
+stopsignal=TERM
 stopasgroup=true
 killasgroup=true
 redirect_stderr=true