diff --git a/awx/main/utils/external_logging.py b/awx/main/utils/external_logging.py index e54c50cbf9..49f74e4146 100644 --- a/awx/main/utils/external_logging.py +++ b/awx/main/utils/external_logging.py @@ -29,7 +29,7 @@ def construct_rsyslog_conf_template(settings=settings): port = settings.LOG_AGGREGATOR_PORT 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%")', ]) if protocol.startswith('http'): @@ -68,7 +68,7 @@ def construct_rsyslog_conf_template(settings=settings): return tmpl def reconfigure_rsyslog(): - tmpl = get_rsyslog_conf_template() + tmpl = construct_rsyslog_conf_template() with open('/var/lib/awx/rsyslog/rsyslog.conf', 'w') as f: f.write(tmpl + '\n') supervisor_service_command(command='restart', service='awx-rsyslogd') diff --git a/awx/main/utils/handlers.py b/awx/main/utils/handlers.py index 26b4282fd1..7f393711d0 100644 --- a/awx/main/utils/handlers.py +++ b/awx/main/utils/handlers.py @@ -12,7 +12,7 @@ from django.conf import settings class RSysLogHandler(logging.handlers.SysLogHandler): def emit(self, msg): - if not os.path.exists(settings.LOGGING_SOCK): + if not os.path.exists(settings.LOGGING['handlers']['external_logger']): return return super(RSysLogHandler, self).emit(msg) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index ab9709f50d..e024c4191d 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -955,7 +955,6 @@ CHANNEL_LAYERS = { } # Logging configuration. -LOGGING_SOCK = '/var/run/rsyslog/rsyslog.sock' LOGGING = { 'version': 1, 'disable_existing_loggers': False, @@ -1014,7 +1013,7 @@ LOGGING = { 'external_logger': { 'class': 'awx.main.utils.handlers.RSysLogHandler', 'formatter': 'json', - 'address': LOGGING_SOCK, + 'address': '/var/run/rsyslog/rsyslog.sock', 'filters': ['external_log_enabled', 'dynamic_level_filter'], }, 'tower_warnings': {