external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-04 00:17:06 +00:00
Code Issues Releases Wiki Activity

restart rsyslogd on GITHUB_ACTIONS=true instead of HUP

Browse Source
This commit is contained in:
downtownallday 2022-09-22 16:56:24 -04:00
parent 86a61a7b12
commit 4531c90434
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/suites/_mail-functions.sh
View File

@ -133,15 +133,9 @@ detect_syslog_error() {
tail --lines=+$count /var/log/syslog 2>>$TEST_OF | ( tail --lines=+$count /var/log/syslog 2>>$TEST_OF | (
let ec=0 # error count let ec=0 # error count
let wc=0 # warning count let wc=0 # warning count
rsyslog_hup="no"
while read line; do while read line; do
# named[7940]: dispatch 0x7f460c02c3a0: shutting down due to TCP receive error: 199.249.112.1#53: connection reset # named[7940]: dispatch 0x7f460c02c3a0: shutting down due to TCP receive error: 199.249.112.1#53: connection reset
# rsyslogd: message repeated 7 times: [[origin software="rsyslogd" swVersion="8.2112.0" x-pid="42237" x-info="https://www.rsyslog.com"] rsyslogd was HUPed]
# rsyslogd: file '/var/log/mail.log': open error: Permission denied [v8.2112.0 try https://www.rsyslog.com/e/2433 ]
# rsyslogd: action 'action-0-builtin:omfile' suspended (module 'builtin:omfile'), retry 0. There should be messages before this one giving the reason for suspension. [v8.2112.0 try https://www.rsyslog.com/e/2007 ]
# rsyslogd: action 'action-0-builtin:omfile' resumed (module 'builtin:omfile') [v8.2112.0 try https://www.rsyslog.com/e/2359 ]
awk ' awk '
/rsyslogd was HUPed/ { exit 3; }
/rsyslogd: action .* (suspended|resumed)/ { exit 2 } /rsyslogd: action .* (suspended|resumed)/ { exit 2 }
!/nsd\[[0-9]+\]/ && /warning:/ { exit 1 } !/nsd\[[0-9]+\]/ && /warning:/ { exit 1 }
/nsd\[[0-9]+\]: error: Cannot open .*nsd\.log/ { exit 2 } /nsd\[[0-9]+\]: error: Cannot open .*nsd\.log/ { exit 2 }
@ -153,26 +147,12 @@ detect_syslog_error() {
' \ ' \
>>$TEST_OF 2>&1 <<< "$line" >>$TEST_OF 2>&1 <<< "$line"
r=$? r=$?
if [ "$rsyslog_hup" = "yes" ]; then
if ! grep "rsyslogd: " <<< "$line" >/dev/null
then
rsyslog_hup="no"
elif [ $r -eq 1 ] && grep "open error: " <<< "$line" >/dev/null
then
# handle "open error: Permission denied" occuring
# soon after a rsyslogd HUP. set to warning
r=2
fi
fi
if [ $r -eq 1 ]; then if [ $r -eq 1 ]; then
let ec+=1 let ec+=1
record "$F_DANGER[ERROR] $line$F_RESET" record "$F_DANGER[ERROR] $line$F_RESET"
elif [ $r -eq 2 ]; then elif [ $r -eq 2 ]; then
let wc+=1 let wc+=1
record "$F_WARN[ WARN] $line$F_RESET" record "$F_WARN[ WARN] $line$F_RESET"
elif [ $r -eq 3 ]; then
rsyslog_hup=yes
else else
if [ "$DETECT_SYSLOG_ERROR_OUTPUT" != "brief" ]; then if [ "$DETECT_SYSLOG_ERROR_OUTPUT" != "brief" ]; then
record "[ OK] $line" record "[ OK] $line"
@ -392,8 +372,11 @@ check_logs() {
else else
pid=$(/usr/bin/pidof rsyslogd) pid=$(/usr/bin/pidof rsyslogd)
fi fi
if [ ! -z "$pid" ]; then if [ "$GITHUB_ACTIONS" = "true" ]; then
kill -HUP $pid systemctl restart rsyslogd >>$TEST_OF 2>&1
sleep 5
elif [ ! -z "$pid" ]; then
kill -HUP $pid >>$TEST_OF 2>&1
sleep 2 sleep 2
fi fi