External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 09:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Write logs to /dev/null if logging is not enabled

Browse Source
This commit is contained in:
Christian Adams
2020-04-15 14:02:56 -04:00
parent 85960d9035
commit 69835e9895
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
awx/main/utils/external_logging.py
View File

@@ -8,10 +8,25 @@ from awx.main.utils.reload import supervisor_service_command
def construct_rsyslog_conf_template(settings=settings): def construct_rsyslog_conf_template(settings=settings):
tmpl = '' tmpl = ''
parts = [] parts = []
enabled = getattr(settings, 'LOG_AGGREGATOR_ENABLED')
host = getattr(settings, 'LOG_AGGREGATOR_HOST', '') host = getattr(settings, 'LOG_AGGREGATOR_HOST', '')
port = getattr(settings, 'LOG_AGGREGATOR_PORT', '') port = getattr(settings, 'LOG_AGGREGATOR_PORT', '')
protocol = getattr(settings, 'LOG_AGGREGATOR_PROTOCOL', '') protocol = getattr(settings, 'LOG_AGGREGATOR_PROTOCOL', '')
timeout = getattr(settings, 'LOG_AGGREGATOR_TCP_TIMEOUT', 5) timeout = getattr(settings, 'LOG_AGGREGATOR_TCP_TIMEOUT', 5)
max_bytes = settings.MAX_EVENT_RES_DATA
parts.extend([
'$WorkDirectory /var/lib/awx/rsyslog',
f'$MaxMessageSize {max_bytes}',
'$IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf',
'module(load="imuxsock" SysSock.Use="off")',
'input(type="imuxsock" Socket="' + settings.LOGGING['handlers']['external_logger']['address'] + '" unlink="on")',
'template(name="awx" type="string" string="%rawmsg-after-pri%")',
])
if not enabled:
parts.append('action(type="omfile" file="/dev/null")') # rsyslog needs *at least* one valid action to start
tmpl = '\n'.join(parts)
return tmpl
if protocol.startswith('http'): if protocol.startswith('http'):
scheme = 'https' scheme = 'https'
# urlparse requires '//' to be provided if scheme is not specified # urlparse requires '//' to be provided if scheme is not specified
@@ -26,19 +41,10 @@ def construct_rsyslog_conf_template(settings=settings):
port = parsed.port port = parsed.port
except ValueError: except ValueError:
port = settings.LOG_AGGREGATOR_PORT port = settings.LOG_AGGREGATOR_PORT
max_bytes = settings.MAX_EVENT_RES_DATA
parts.extend([
'$WorkDirectory /var/lib/awx/rsyslog',
f'$MaxMessageSize {max_bytes}',
'$IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf',
'module(load="imuxsock" SysSock.Use="off")',
'input(type="imuxsock" Socket="' + settings.LOGGING['handlers']['external_logger']['address'] + '" unlink="on")',
'template(name="awx" type="string" string="%rawmsg-after-pri%")',
])
if protocol.startswith('http'):
# https://github.com/rsyslog/rsyslog-doc/blob/master/source/configuration/modules/omhttp.rst # https://github.com/rsyslog/rsyslog-doc/blob/master/source/configuration/modules/omhttp.rst
ssl = "on" if parsed.scheme == 'https' else "off" ssl = 'on' if parsed.scheme == 'https' else 'off'
skip_verify = "off" if settings.LOG_AGGREGATOR_VERIFY_CERT else "on" skip_verify = 'off' if settings.LOG_AGGREGATOR_VERIFY_CERT else 'on'
if not port: if not port:
port = 443 if parsed.scheme == 'https' else 80 port = 443 if parsed.scheme == 'https' else 80
@@ -82,7 +88,7 @@ def construct_rsyslog_conf_template(settings=settings):
f'action(type="omfwd" target="{host}" port="{port}" protocol="{protocol}" action.resumeRetryCount="-1" action.resumeInterval="{timeout}" template="awx")' # noqa f'action(type="omfwd" target="{host}" port="{port}" protocol="{protocol}" action.resumeRetryCount="-1" action.resumeInterval="{timeout}" template="awx")' # noqa
) )
else: else:
parts.append(f'action(type="omfile" file="/dev/null")') # rsyslog needs *at least* one valid action to start parts.append('action(type="omfile" file="/dev/null")') # rsyslog needs *at least* one valid action to start
tmpl = '\n'.join(parts) tmpl = '\n'.join(parts)
return tmpl return tmpl