zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-03 13:21:48 -05:00
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
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')

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

@@ -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)