Merge pull request #3877 from ansible/backport-external-log-fix

backport a fix to external logging aggregation
This commit is contained in:
Ryan Petrello 2019-10-22 07:43:35 -04:00 committed by GitHub
commit a0bf3459eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -294,18 +294,19 @@ class AWXProxyHandler(logging.Handler):
super(AWXProxyHandler, self).__init__(**kwargs)
self._handler = None
self._old_kwargs = {}
self._auditor = logging.handlers.RotatingFileHandler(
filename='/var/log/tower/external.log',
maxBytes=1024 * 1024 * 50, # 50 MB
backupCount=5,
)
if settings.LOG_AGGREGATOR_AUDIT:
self._auditor = logging.handlers.RotatingFileHandler(
filename='/var/log/tower/external.log',
maxBytes=1024 * 1024 * 50, # 50 MB
backupCount=5,
)
class WritableLogstashFormatter(LogstashFormatter):
@classmethod
def serialize(cls, message):
return json.dumps(message)
class WritableLogstashFormatter(LogstashFormatter):
@classmethod
def serialize(cls, message):
return json.dumps(message)
self._auditor.setFormatter(WritableLogstashFormatter())
self._auditor.setFormatter(WritableLogstashFormatter())
def get_handler_class(self, protocol):
return HANDLER_MAPPING.get(protocol, AWXNullHandler)