External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 15:36:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9724 from ryanpetrello/timey-whimey

Browse Source 
fix up a bug in rsyslogd error handling

@kdelee I'm unclear on why this is actually happening, so I'm just gonna cheat and generate a datestring

Reviewed-by: Elijah DeLee <kdelee@redhat.com>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-03-26 21:02:18 +00:00
committed by GitHub
parent f75a0ca1b6 4eb85ad23e
commit ffdce7b1d0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/utils/handlers.py
View File

@@ -5,6 +5,7 @@
import logging import logging
import sys import sys
import traceback import traceback
from datetime import datetime
# Django # Django
from django.conf import settings from django.conf import settings
@@ -34,7 +35,8 @@ class RSysLogHandler(logging.handlers.SysLogHandler):
# because the alternative is blocking the # because the alternative is blocking the
# socket.send() in the Python process, which we definitely don't # socket.send() in the Python process, which we definitely don't
# want to do) # want to do)
msg = f'{record.asctime} ERROR rsyslogd was unresponsive: ' dt = datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')
msg = f'{dt} ERROR rsyslogd was unresponsive: '
exc = traceback.format_exc() exc = traceback.format_exc()
try: try:
msg += exc.splitlines()[-1] msg += exc.splitlines()[-1]