From 3f5982de0f401b3794bc02488c02d6ad34f2aa7f Mon Sep 17 00:00:00 2001 From: Martin Berghaus Date: Thu, 16 Oct 2025 19:09:03 +0200 Subject: [PATCH] better check for ssh control master --- script/monitor/generic/NGINX_CHECK.sh | 2 +- script/monitor/generic/OVERRIDDEN_DOMAIN_CHECK.sh | 2 +- script/monitor/generic/ZFS_POOL_CHECK.sh | 2 +- script/monitor/generic/ZFS_SYNC_CHECK.sh | 2 +- script/monitor/generic/ZFS_USAGE_CHECK.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/script/monitor/generic/NGINX_CHECK.sh b/script/monitor/generic/NGINX_CHECK.sh index c6eab8b..faa6522 100755 --- a/script/monitor/generic/NGINX_CHECK.sh +++ b/script/monitor/generic/NGINX_CHECK.sh @@ -13,7 +13,7 @@ _SOCKET='~/.ssh/%r@%h:%p' function checkOrStartSSHMaster() { - timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \ + timeout --preserve-status 1 ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} 2>&1 | grep -q -F 'Master running' \ && 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 40c166c..48810d1 100755 --- a/script/monitor/generic/OVERRIDDEN_DOMAIN_CHECK.sh +++ b/script/monitor/generic/OVERRIDDEN_DOMAIN_CHECK.sh @@ -13,7 +13,7 @@ _SOCKET='~/.ssh/%r@%h:%p' function checkOrStartSSHMaster() { - timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \ + timeout --preserve-status 1 ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} 2>&1 | grep -q -F 'Master running' \ && 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 458ec9b..164e2da 100755 --- a/script/monitor/generic/ZFS_POOL_CHECK.sh +++ b/script/monitor/generic/ZFS_POOL_CHECK.sh @@ -14,7 +14,7 @@ _SOCKET='~/.ssh/%r@%h:%p' function checkOrStartSSHMaster() { - timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \ + timeout --preserve-status 1 ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} 2>&1 | grep -q -F 'Master running' \ && 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 1849627..b524050 100755 --- a/script/monitor/generic/ZFS_SYNC_CHECK.sh +++ b/script/monitor/generic/ZFS_SYNC_CHECK.sh @@ -30,7 +30,7 @@ _DEBUG_PATH="/tmp/monitor/" function checkOrStartSSHMaster() { - timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \ + timeout --preserve-status 1 ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} 2>&1 | grep -q -F 'Master running' \ && 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 f276824..b8ffc6c 100755 --- a/script/monitor/generic/ZFS_USAGE_CHECK.sh +++ b/script/monitor/generic/ZFS_USAGE_CHECK.sh @@ -13,7 +13,7 @@ _SOCKET='~/.ssh/%r@%h:%p' function checkOrStartSSHMaster() { - timeout --preserve-status 3 ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} exit 0 &> /dev/null \ + timeout --preserve-status 1 ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} 2>&1 | grep -q -F 'Master running' \ && return 0 ssh -O stop -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} &> /dev/null