From 9e11ab1fd4a5d568181eeecb8efad4793d618e3e Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sat, 28 Dec 2019 11:37:04 +0100
Subject: [PATCH] [Watchdog] Retry to get current ACME log status, if empty
 (may fix watchdog mails on very busy servers - eg while running a backup)

---
 data/Dockerfiles/watchdog/watchdog.sh | 6 +++++-
 docker-compose.yml                    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh
index d90d35d4..5079bd57 100755
--- a/data/Dockerfiles/watchdog/watchdog.sh
+++ b/data/Dockerfiles/watchdog/watchdog.sh
@@ -476,7 +476,11 @@ acme_checks() {
   while [ ${err_count} -lt ${THRESHOLD} ]; do
     err_c_cur=${err_count}
     ACME_LOG_STATUS_PREV=${ACME_LOG_STATUS}
-    ACME_LOG_STATUS=$(redis-cli -h redis GET ACME_FAIL_TIME)
+    ACME_LC=0
+    until [[ ! -z ${ACME_LOG_STATUS} ]] || [ ${ACME_LC} -ge 3 ]; do
+      ACME_LOG_STATUS=$(redis-cli -h redis GET ACME_FAIL_TIME 2> /dev/null)
+      ACME_LC=$((ACME_LC+1))
+    done
     if [[ ${ACME_LOG_STATUS_PREV} != ${ACME_LOG_STATUS} ]]; then
       err_count=$(( ${err_count} + 1 ))
     fi
diff --git a/docker-compose.yml b/docker-compose.yml
index dc4d201a..e0eff60f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -365,7 +365,7 @@ services:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
-      image: mailcow/watchdog:1.65
+      image: mailcow/watchdog:1.66
       # Debug
       #command: /watchdog.sh
       dns: