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

Remove unneeded logging sock variable

Browse Source
This commit is contained in:
Christian Adams
2020-03-13 17:31:04 -04:00
parent eb12f45e8e
commit 7fd79b8e54
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ def construct_rsyslog_conf_template(settings=settings):
port = settings.LOG_AGGREGATOR_PORT port = settings.LOG_AGGREGATOR_PORT
parts.extend([ parts.extend([
'input(type="imuxsock" Socket="' + settings.LOGGING_SOCK + '" unlink="on")', 'input(type="imuxsock" Socket="' + settings.LOGGING['handlers']['external_logger'] + '" unlink="on")',
'template(name="awx" type="string" string="%msg%")', 'template(name="awx" type="string" string="%msg%")',
]) ])
if protocol.startswith('http'): if protocol.startswith('http'):
@@ -68,7 +68,7 @@ def construct_rsyslog_conf_template(settings=settings):
return tmpl return tmpl
def reconfigure_rsyslog(): def reconfigure_rsyslog():
tmpl = get_rsyslog_conf_template() tmpl = construct_rsyslog_conf_template()
with open('/var/lib/awx/rsyslog/rsyslog.conf', 'w') as f: with open('/var/lib/awx/rsyslog/rsyslog.conf', 'w') as f:
f.write(tmpl + '\n') f.write(tmpl + '\n')
supervisor_service_command(command='restart', service='awx-rsyslogd') supervisor_service_command(command='restart', service='awx-rsyslogd')

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

@@ -12,7 +12,7 @@ from django.conf import settings
class RSysLogHandler(logging.handlers.SysLogHandler): class RSysLogHandler(logging.handlers.SysLogHandler):
def emit(self, msg): def emit(self, msg):
if not os.path.exists(settings.LOGGING_SOCK): if not os.path.exists(settings.LOGGING['handlers']['external_logger']):
return return
return super(RSysLogHandler, self).emit(msg) return super(RSysLogHandler, self).emit(msg)

3
awx/settings/defaults.py
View File

@@ -955,7 +955,6 @@ CHANNEL_LAYERS = {
} }
# Logging configuration. # Logging configuration.
LOGGING_SOCK = '/var/run/rsyslog/rsyslog.sock'
LOGGING = { LOGGING = {
'version': 1, 'version': 1,
'disable_existing_loggers': False, 'disable_existing_loggers': False,
@@ -1014,7 +1013,7 @@ LOGGING = {
'external_logger': { 'external_logger': {
'class': 'awx.main.utils.handlers.RSysLogHandler', 'class': 'awx.main.utils.handlers.RSysLogHandler',
'formatter': 'json', 'formatter': 'json',
'address': LOGGING_SOCK, 'address': '/var/run/rsyslog/rsyslog.sock',
'filters': ['external_log_enabled', 'dynamic_level_filter'], 'filters': ['external_log_enabled', 'dynamic_level_filter'],
}, },
'tower_warnings': { 'tower_warnings': {