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

rsyslogd: ignore /dev/log when we load imuxsock

Browse Source
This commit is contained in:
Ryan Petrello
2020-04-14 11:34:58 -04:00
parent dbe949a2c2
commit 0f74a05fea
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ def construct_rsyslog_conf_template(settings=settings):
'$WorkDirectory /var/lib/awx/rsyslog', '$WorkDirectory /var/lib/awx/rsyslog',
f'$MaxMessageSize {max_bytes}', f'$MaxMessageSize {max_bytes}',
'$IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf', '$IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf',
'$ModLoad imuxsock', 'module(load="imuxsock" SysSock.Use="off")',
'input(type="imuxsock" Socket="' + settings.LOGGING['handlers']['external_logger']['address'] + '" unlink="on")', 'input(type="imuxsock" Socket="' + settings.LOGGING['handlers']['external_logger']['address'] + '" unlink="on")',
'template(name="awx" type="string" string="%rawmsg-after-pri%")', 'template(name="awx" type="string" string="%rawmsg-after-pri%")',
]) ])

2
installer/roles/image_build/files/rsyslog.conf
View File

@@ -1,7 +1,7 @@
$WorkDirectory /var/lib/awx/rsyslog $WorkDirectory /var/lib/awx/rsyslog
$MaxMessageSize 700000 $MaxMessageSize 700000
$IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf $IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf
$ModLoad imuxsock module(load="imuxsock" SysSock.Use="off")
input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on") input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on")
template(name="awx" type="string" string="%msg%") template(name="awx" type="string" string="%msg%")
action(type="omfile" file="/dev/null") action(type="omfile" file="/dev/null")

2
tools/docker-compose/rsyslog.conf
View File

@@ -1,7 +1,7 @@
$WorkDirectory /var/lib/awx/rsyslog $WorkDirectory /var/lib/awx/rsyslog
$MaxMessageSize 700000 $MaxMessageSize 700000
$IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf $IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf
$ModLoad imuxsock module(load="imuxsock" SysSock.Use="off")
input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on") input(type="imuxsock" Socket="/var/run/rsyslog/rsyslog.sock" unlink="on")
template(name="awx" type="string" string="%msg%") template(name="awx" type="string" string="%msg%")
action(type="omfile" file="/dev/null") action(type="omfile" file="/dev/null")