public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Watchdog] Watch olefy

a95a3f61

andryyy <[email protected]> 7 years ago

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

Diff

diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh
index ff97bdbe..bc5d2ad4 100755
--- a/data/Dockerfiles/watchdog/watchdog.sh
+++ b/data/Dockerfiles/watchdog/watchdog.sh
@@ -549,7 +549,7 @@ olefy_checks() {
     touch /tmp/olefy-mailcow; echo "$(tail -50 /tmp/olefy-mailcow)" > /tmp/olefy-mailcow
     host_ip=$(get_container_ip olefy-mailcow)
     err_c_cur=${err_count}
-    /usr/lib/nagios/plugins/check_tcp -4 -H ${host_ip} -p 10055 2>> /tmp/olefy-mailcow 1>&2; err_count=$(( ${err_count} + $? ))
+    /usr/lib/nagios/plugins/check_tcp -4 -H ${host_ip} -p 10055 -s "PING\n" 2>> /tmp/olefy-mailcow 1>&2; err_count=$(( ${err_count} + $? ))
     [ ${err_c_cur} -eq ${err_count} ] && [ ! $((${err_count} - 1)) -lt 0 ] && err_count=$((${err_count} - 1)) diff_c=1
     [ ${err_c_cur} -ne ${err_count} ] && diff_c=$(( ${err_c_cur} - ${err_count} ))
     progress "Olefy" ${THRESHOLD} $(( ${THRESHOLD} - ${err_count} )) ${diff_c}
@@ -719,17 +719,17 @@ PID=$!
 echo "Spawned fail2ban_checks with PID ${PID}"
 BACKGROUND_TASKS+=(${PID})
 
-#(
-#while true; do
-#  if ! olefy_checks; then
-#    log_msg "Olefy hit error limit"
-#    echo olefy-mailcow > /tmp/com_pipe
-#  fi
-#done
-#) &
-#PID=$!
-#echo "Spawned olefy_checks with PID ${PID}"
-#BACKGROUND_TASKS+=(${PID})
+(
+while true; do
+  if ! olefy_checks; then
+    log_msg "Olefy hit error limit"
+    echo olefy-mailcow > /tmp/com_pipe
+  fi
+done
+) &
+PID=$!
+echo "Spawned olefy_checks with PID ${PID}"
+BACKGROUND_TASKS+=(${PID})
 
 (
 while true; do
diff --git a/docker-compose.yml b/docker-compose.yml
index d2081bbf..4567bcdf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -364,7 +364,7 @@ services:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
-      image: mailcow/watchdog:1.60
+      image: mailcow/watchdog:1.61
       # Debug
       #command: /watchdog.sh
       build: ./data/Dockerfiles/watchdog