From 1bb7add3e64da8bfee8188328dd6374da6775937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 21 Sep 2020 23:24:43 +0200 Subject: [PATCH] move from MYSHELLCONFIG_DEBUG to logger --- functions.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/functions.sh b/functions.sh index e29e2d7..626693d 100755 --- a/functions.sh +++ b/functions.sh @@ -632,21 +632,21 @@ reachable () { # dig does not consult /etc/hosts, so use getent hosts instead #local IP=$(dig +nocmd $SERVER a +noall +answer|tail -n 1 |awk '{print $5}') # getent ahostsv4 returns only ipv4 addresses - $MYSHELLCONFIG_DEBUG && echo -n "Try to resolve $SERVER: " + loginfo -n "Try to resolve $SERVER: " local IP=$(getent $GETENTHOSTS $SERVER|awk '$0 ~ /STREAM/ {print $1}'|uniq|head -n1) if [ -z ${IP-x} ]; then - $MYSHELLCONFIG_DEBUG && echo "not resolvable -> exit" + logwarn "not resolvable -> exit" return 1 else - $MYSHELLCONFIG_DEBUG && echo $IP + logwarn $IP fi local PORT=${2:-22} local SEC=${3:-1} local res=999 local i - $MYSHELLCONFIG_DEBUG && echo -n "Try to connect to ${SERVER} (${IP}):${PORT} " >&2 + loginfo -n "Try to connect to ${SERVER} (${IP}):${PORT} " >&2 for i in $(seq 1 $SEC); do - $MYSHELLCONFIG_DEBUG && echo -n "." >&2 + loginfo -n "." >&2 if reachable-default ${IP} ${PORT} 2>/dev/null; then res=0 break @@ -656,9 +656,7 @@ reachable () { [ ${SEC} -gt 1 -a $i -lt ${SEC} ] && sleep 1 done - if $MYSHELLCONFIG_DEBUG ; then - [ ${res} -gt 0 ] && echo " not reachable" >&2 || echo " success" >&2; - fi + [ ${res} -gt 0 ] && loginfo " not reachable" >&2 || loginfo " success" >&2; return $res