From c8a72bf6424b87a89bfda913fd9aaf4448878e58 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sat, 26 Dec 2020 10:20:46 +0100 Subject: [PATCH] [Watchdog] Return score with Rspamd check --- data/Dockerfiles/watchdog/watchdog.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh index 39f89e15..1e7c2f49 100755 --- a/data/Dockerfiles/watchdog/watchdog.sh +++ b/data/Dockerfiles/watchdog/watchdog.sh @@ -709,10 +709,10 @@ From: watchdog@localhost Empty ' | usr/bin/curl --max-time 10 -s --data-binary @- --unix-socket /var/lib/rspamd/rspamd.sock http://rspamd/scan | jq -rc .default.required_score) if [[ ${SCORE} != "9999" ]]; then - echo "Rspamd settings check failed" 2>> /tmp/rspamd-mailcow 1>&2 + echo "Rspamd settings check failed, score returned: ${SCORE}" 2>> /tmp/rspamd-mailcow 1>&2 err_count=$(( ${err_count} + 1)) else - echo "Rspamd settings check succeeded" 2>> /tmp/rspamd-mailcow 1>&2 + echo "Rspamd settings check succeeded, score returned: ${SCORE}" 2>> /tmp/rspamd-mailcow 1>&2 fi # A dirty hack until a PING PONG event is implemented to worker proxy # We expect an empty response, not a timeout