From 4abe3ba061c612f3aa8c00a41d7dee431e420c51 Mon Sep 17 00:00:00 2001
From: m8in <m8in@gmx.de>
Date: Tue, 14 Oct 2025 20:59:25 +0200
Subject: [PATCH] checkOrStartSSHMaster() improved

---
 script/monitor/generic/NGINX_CHECK.sh             | 3 +--
 script/monitor/generic/OVERRIDDEN_DOMAIN_CHECK.sh | 3 +--
 script/monitor/generic/ZFS_POOL_CHECK.sh          | 3 +--
 script/monitor/generic/ZFS_SYNC_CHECK.sh          | 3 +--
 script/monitor/generic/ZFS_USAGE_CHECK.sh         | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/script/monitor/generic/NGINX_CHECK.sh b/script/monitor/generic/NGINX_CHECK.sh
index 4414f02..c6eab8b 100755
--- a/script/monitor/generic/NGINX_CHECK.sh
+++ b/script/monitor/generic/NGINX_CHECK.sh
@@ -13,8 +13,7 @@ _SOCKET='~/.ssh/%r@%h:%p'
 
 
 function checkOrStartSSHMaster() {
-    timeout --preserve-status 1 "ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN}" &> /dev/null \
-        && echo "master checked" \
+    timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \
         && return 0
 
     ssh -O stop -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} &> /dev/null
diff --git a/script/monitor/generic/OVERRIDDEN_DOMAIN_CHECK.sh b/script/monitor/generic/OVERRIDDEN_DOMAIN_CHECK.sh
index 5d88de7..40c166c 100755
--- a/script/monitor/generic/OVERRIDDEN_DOMAIN_CHECK.sh
+++ b/script/monitor/generic/OVERRIDDEN_DOMAIN_CHECK.sh
@@ -13,8 +13,7 @@ _SOCKET='~/.ssh/%r@%h:%p'
 
 
 function checkOrStartSSHMaster() {
-    timeout --preserve-status 1 "ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN}" &> /dev/null \
-        && echo "master checked" \
+    timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \
         && return 0
 
     ssh -O stop -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} &> /dev/null
diff --git a/script/monitor/generic/ZFS_POOL_CHECK.sh b/script/monitor/generic/ZFS_POOL_CHECK.sh
index 89aedc1..458ec9b 100755
--- a/script/monitor/generic/ZFS_POOL_CHECK.sh
+++ b/script/monitor/generic/ZFS_POOL_CHECK.sh
@@ -14,8 +14,7 @@ _SOCKET='~/.ssh/%r@%h:%p'
 
 
 function checkOrStartSSHMaster() {
-    timeout --preserve-status 1 "ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN}" &> /dev/null \
-        && echo "master checked" \
+    timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \
         && return 0
 
     ssh -O stop -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} &> /dev/null
diff --git a/script/monitor/generic/ZFS_SYNC_CHECK.sh b/script/monitor/generic/ZFS_SYNC_CHECK.sh
index 6c84aad..1849627 100755
--- a/script/monitor/generic/ZFS_SYNC_CHECK.sh
+++ b/script/monitor/generic/ZFS_SYNC_CHECK.sh
@@ -30,8 +30,7 @@ _DEBUG_PATH="/tmp/monitor/"
 
 
 function checkOrStartSSHMaster() {
-    timeout --preserve-status 1 "ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN}" &> /dev/null \
-        && echo "master checked" \
+    timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \
         && return 0
 
     ssh -O stop -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} &> /dev/null
diff --git a/script/monitor/generic/ZFS_USAGE_CHECK.sh b/script/monitor/generic/ZFS_USAGE_CHECK.sh
index 1c2f84a..f276824 100755
--- a/script/monitor/generic/ZFS_USAGE_CHECK.sh
+++ b/script/monitor/generic/ZFS_USAGE_CHECK.sh
@@ -13,8 +13,7 @@ _SOCKET='~/.ssh/%r@%h:%p'
 
 
 function checkOrStartSSHMaster() {
-    timeout --preserve-status 1 "ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN}" &> /dev/null \
-        && echo "master checked" \
+    timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \
         && return 0
 
     ssh -O stop -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} &> /dev/null