zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-14 07:48:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks to Test Button logic and cleans up flake8 and test failures

Browse Source
This commit is contained in:
Christian Adams
2020-03-16 12:42:08 -04:00
parent 7fd79b8e54
commit d350551547
12 changed files with 119 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/utils/external_logging.py
+3 -3
View File
@@ -12,7 +12,6 @@ def construct_rsyslog_conf_template(settings=settings):
host = getattr(settings, 'LOG_AGGREGATOR_HOST', '')
port = getattr(settings, 'LOG_AGGREGATOR_PORT', '')
protocol = getattr(settings, 'LOG_AGGREGATOR_PROTOCOL', '')
import pdb; pdb.set_trace()
if protocol.startswith('http'):
scheme = 'https'
# urlparse requires '//' to be provided if scheme is not specified
@@ -29,7 +28,7 @@ def construct_rsyslog_conf_template(settings=settings):
port = settings.LOG_AGGREGATOR_PORT
parts.extend([
'input(type="imuxsock" Socket="' + settings.LOGGING['handlers']['external_logger'] + '" unlink="on")',
'input(type="imuxsock" Socket="' + settings.LOGGING['handlers']['external_logger']['address'] + '" unlink="on")',
'template(name="awx" type="string" string="%msg%")',
])
if protocol.startswith('http'):
@@ -66,7 +65,8 @@ def construct_rsyslog_conf_template(settings=settings):
)
tmpl = '\n'.join(parts)
return tmpl
def reconfigure_rsyslog():
tmpl = construct_rsyslog_conf_template()
with open('/var/lib/awx/rsyslog/rsyslog.conf', 'w') as f: