External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix a bug introduced upstream with settings.LOG_AGGREGATOR_AUDIT

Browse Source
This commit is contained in:
Ryan Petrello
2019-10-22 12:12:22 -04:00
parent a0bf3459eb
commit 8701f83922
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,13 +288,17 @@ class AWXProxyHandler(logging.Handler):
''' '''
thread_local = threading.local() thread_local = threading.local()
_auditor = None
def __init__(self, **kwargs): def __init__(self, **kwargs):
# TODO: process 'level' kwarg # TODO: process 'level' kwarg
super(AWXProxyHandler, self).__init__(**kwargs) super(AWXProxyHandler, self).__init__(**kwargs)
self._handler = None self._handler = None
self._old_kwargs = {} self._old_kwargs = {}
if settings.LOG_AGGREGATOR_AUDIT:
@property
def auditor(self):
if not self._auditor:
self._auditor = logging.handlers.RotatingFileHandler( self._auditor = logging.handlers.RotatingFileHandler(
filename='/var/log/tower/external.log', filename='/var/log/tower/external.log',
maxBytes=1024 * 1024 * 50, # 50 MB maxBytes=1024 * 1024 * 50, # 50 MB
@@ -307,6 +311,7 @@ class AWXProxyHandler(logging.Handler):
return json.dumps(message) return json.dumps(message)
self._auditor.setFormatter(WritableLogstashFormatter()) self._auditor.setFormatter(WritableLogstashFormatter())
return self._auditor
def get_handler_class(self, protocol): def get_handler_class(self, protocol):
return HANDLER_MAPPING.get(protocol, AWXNullHandler) return HANDLER_MAPPING.get(protocol, AWXNullHandler)
@@ -341,8 +346,8 @@ class AWXProxyHandler(logging.Handler):
if AWXProxyHandler.thread_local.enabled: if AWXProxyHandler.thread_local.enabled:
actual_handler = self.get_handler() actual_handler = self.get_handler()
if settings.LOG_AGGREGATOR_AUDIT: if settings.LOG_AGGREGATOR_AUDIT:
self._auditor.setLevel(settings.LOG_AGGREGATOR_LEVEL) self.auditor.setLevel(settings.LOG_AGGREGATOR_LEVEL)
self._auditor.emit(record) self.auditor.emit(record)
return actual_handler.emit(record) return actual_handler.emit(record)
def perform_test(self, custom_settings): def perform_test(self, custom_settings):