summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElijah DeLee <kdelee@redhat.com>2024-08-16 17:16:14 +0200
committerElijah DeLee <kdelee@redhat.com>2024-08-29 15:24:35 +0200
commit444af2b500517e0cc09f791b7775d4b5b5ed6cf4 (patch)
tree0e537df2eaf570c555a36f0fce5acd5bd87cc175
parentRemove archaic monkey patches (#15338) (diff)
downloadawx-444af2b500517e0cc09f791b7775d4b5b5ed6cf4.tar.xz
awx-444af2b500517e0cc09f791b7775d4b5b5ed6cf4.zip
catch harakiri graceful signal in middlware and log debug info
Middleware is from django_ansible_base
-rw-r--r--awx/settings/defaults.py1
-rw-r--r--tools/ansible/roles/dockerfile/files/uwsgi.ini5
2 files changed, 6 insertions, 0 deletions
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 6f57730627..50e467adf2 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -1017,6 +1017,7 @@ RECEPTOR_LOG_LEVEL = 'info'
MIDDLEWARE = [
'django_guid.middleware.guid_middleware',
+ 'ansible_base.lib.middleware.logging.log_request.LogTracebackMiddleware',
'awx.main.middleware.SettingsCacheMiddleware',
'awx.main.middleware.TimingMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
diff --git a/tools/ansible/roles/dockerfile/files/uwsgi.ini b/tools/ansible/roles/dockerfile/files/uwsgi.ini
index bfd1f87f70..0f27eb9b41 100644
--- a/tools/ansible/roles/dockerfile/files/uwsgi.ini
+++ b/tools/ansible/roles/dockerfile/files/uwsgi.ini
@@ -10,6 +10,11 @@ master-fifo = /var/lib/awx/awxfifo
max-requests = 1000
buffer-size = 32768
+harakiri = 115
+harakiri-graceful-timeout = 110
+harakiri-graceful-signal = 6
+py-call-osafterfork = true
+
if-env = UWSGI_MOUNT_PATH
mount = %(_)=awx.wsgi:application
endif =