Update services.inc
This commit is contained in:
@@ -16,7 +16,7 @@ SINGLE_SERVER_SERVICE_CHECK(){
|
||||
|
||||
# rm -f ${NM_TMPFOLDER}/.singleserver*
|
||||
|
||||
if [ ! -f ${NM_TMPFOLDER}/.skip ] && ([[ "$(declare -p ${1^^}_SINGLESRVR_SERVICES)" =~ "declare -a" ]] || [[ "$(declare -p ${1^^}_SINGLESRVR_DOCKERS)" =~ "declare -a" ]]); then
|
||||
if [ ! -f ${NM_TMPFOLDER}/.skip ] && ([[ "$(declare -p ${1^^}_SINGLESRVR_SERVICES)" =~ "declare -a" ]] || [[ "$(declare -p ${1^^}_SINGLESRVR_DOCKERS)" =~ "declare -a" ]] || [ "${1^^}" == "LPD" ]); then
|
||||
if [[ $(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) == *${NM_SINGLESRVR_IP[${1^^}]}* ]]; then
|
||||
# if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.primary)) -ge 300 ]; then
|
||||
# if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ]; then
|
||||
@@ -64,23 +64,27 @@ SINGLE_SERVER_SERVICE_CHECK(){
|
||||
# fi
|
||||
|
||||
if [ "${1^^}" == "LPD" ]; then
|
||||
/usr/local/bin/nmg skip on >/dev/null 2>&1
|
||||
completed=false; scanstart=$(date +%s)
|
||||
until [ "${completed}" == "true" ]; do
|
||||
dnstest=$(dig +short www.google.com @127.0.0.1)
|
||||
if [ "${dnstest}" != "" ]; then
|
||||
completed=true
|
||||
break
|
||||
dnstest=$(dig +short www.google.com @127.0.0.1)
|
||||
if [ "${dnstest}" == "" ]; then
|
||||
/usr/local/bin/nmg skip on >/dev/null 2>&1
|
||||
completed=false; scanstart=$(date +%s)
|
||||
sleep 4s
|
||||
until [ "${completed}" == "true" ]; do
|
||||
dnstest=$(dig +short www.google.com @127.0.0.1)
|
||||
if [ "${dnstest}" != "" ]; then
|
||||
completed=true
|
||||
break
|
||||
|
||||
elif [ $(($(date +%s)-scanstart)) -gt 1200 ]; then
|
||||
SENDNOTICE "${NM_HOSTNAMES[${RUN_NODE_IP}]} DNS Startup Failure" "${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP})
|
||||
elif [ $(($(date +%s)-scanstart)) -ge 1200 ]; then
|
||||
SENDNOTICE "${NM_HOSTNAMES[${RUN_NODE_IP}]} DNS Startup Failure" "${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP})
|
||||
Server did not start serving DNS requests within 20mins you moron...." 1
|
||||
killall bash
|
||||
exit 1
|
||||
fi
|
||||
sleep 15s
|
||||
done
|
||||
/usr/local/bin/nmg skip off >/dev/null 2>&1
|
||||
killall bash
|
||||
exit 1
|
||||
fi
|
||||
sleep 15s
|
||||
done
|
||||
/usr/local/bin/nmg skip off >/dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user