jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move from MYSHELLCONFIG_DEBUG to logger

Browse source
This commit is contained in:
Jakobus Schürz 2020-09-21 23:24:43 +02:00
parent b8b811120e
commit 1bb7add3e6
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
functions.sh
View file

@ -632,21 +632,21 @@ reachable () {
# dig does not consult /etc/hosts, so use getent hosts instead # 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}') #local IP=$(dig +nocmd $SERVER a +noall +answer|tail -n 1 |awk '{print $5}')
# getent ahostsv4 returns only ipv4 addresses # 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) local IP=$(getent $GETENTHOSTS $SERVER|awk '$0 ~ /STREAM/ {print $1}'|uniq|head -n1)
if [ -z ${IP-x} ]; then if [ -z ${IP-x} ]; then
$MYSHELLCONFIG_DEBUG && echo "not resolvable -> exit" logwarn "not resolvable -> exit"
return 1 return 1
else else
$MYSHELLCONFIG_DEBUG && echo $IP logwarn $IP
fi fi
local PORT=${2:-22} local PORT=${2:-22}
local SEC=${3:-1} local SEC=${3:-1}
local res=999 local res=999
local i 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 for i in $(seq 1 $SEC); do
$MYSHELLCONFIG_DEBUG && echo -n "." >&2 loginfo -n "." >&2
if reachable-default ${IP} ${PORT} 2>/dev/null; then if reachable-default ${IP} ${PORT} 2>/dev/null; then
res=0 res=0
break break
@ -656,9 +656,7 @@ reachable () {
[ ${SEC} -gt 1 -a $i -lt ${SEC} ] && sleep 1 [ ${SEC} -gt 1 -a $i -lt ${SEC} ] && sleep 1
done done
if $MYSHELLCONFIG_DEBUG ; then [ ${res} -gt 0 ] && loginfo " not reachable" >&2 || loginfo " success" >&2;
[ ${res} -gt 0 ] && echo " not reachable" >&2 || echo " success" >&2;
fi
return $res return $res