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

Ignore named connection reset error and reduce reported slapd log output

Browse Source
This commit is contained in:
downtownallday 2020-09-10 16:35:19 -04:00
parent 5852a7aabb
commit ba85b6fd7b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/suites/_init.sh
View File

@ -27,6 +27,8 @@ declare -i OVERALL_COUNT_SUITES=0
FAILURE_IS_FATAL=no FAILURE_IS_FATAL=no
DUMP_FAILED_TESTS_OUTPUT=no DUMP_FAILED_TESTS_OUTPUT=no
SKIP_REMOTE_SMTP_TESTS=no SKIP_REMOTE_SMTP_TESTS=no
DETECT_SLAPD_LOG_ERROR_OUTPUT=brief
DETECT_SYSLOG_ERROR_OUTPUT=normal
# record a list of output files for failed tests # record a list of output files for failed tests
FAILED_TESTS_MANIFEST="$BASE_OUTPUTDIR/failed_tests_manifest.txt" FAILED_TESTS_MANIFEST="$BASE_OUTPUTDIR/failed_tests_manifest.txt"

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

@ -101,6 +101,7 @@ detect_syslog_error() {
let ec=0 # error count let ec=0 # error count
let wc=0 # warning count let wc=0 # warning count
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
awk ' awk '
/status=(bounced|deferred|undeliverable)/ { exit 1 } /status=(bounced|deferred|undeliverable)/ { exit 1 }
/warning:/ && /spamhaus\.org: RBL lookup error:/ { exit 2 } /warning:/ && /spamhaus\.org: RBL lookup error:/ { exit 2 }
@ -109,6 +110,7 @@ detect_syslog_error() {
/Error in / { exit 1 } /Error in / { exit 1 }
/Exception on / { exit 1 } /Exception on / { exit 1 }
/named\[\d+\]:.* verify failed/ { exit 1 } /named\[\d+\]:.* verify failed/ { exit 1 }
/named\[\d+\]:.* receive error: .*: connection reset/ { exit 2 }
' \ ' \
>>$TEST_OF 2>&1 <<< "$line" >>$TEST_OF 2>&1 <<< "$line"
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
@ -118,8 +120,10 @@ detect_syslog_error() {
let wc+=1 let wc+=1
record "$F_WARN[ WARN] $line$F_RESET" record "$F_WARN[ WARN] $line$F_RESET"
else else
if [ "$DETECT_SYSLOG_ERROR_OUTPUT" != "brief" ]; then
record "[ OK] $line" record "[ OK] $line"
fi fi
fi
done done
[ $ec -gt 0 ] && exit 0 [ $ec -gt 0 ] && exit 0
exit 1 # no errors exit 1 # no errors
@ -177,8 +181,10 @@ detect_slapd_log_error() {
elif [ $r -eq 3 ]; then elif [ $r -eq 3 ]; then
let ignored+=1 let ignored+=1
else else
if [ "$DETECT_SLAPD_LOG_ERROR_OUTPUT" != "brief" ]; then
record "[ OK] $line" record "[ OK] $line"
fi fi
fi
done done
record "$ignored unreported/ignored log lines" record "$ignored unreported/ignored log lines"
[ $ec -gt 0 ] && exit 0 [ $ec -gt 0 ] && exit 0