Correcting more messages

functions/core_messages.sh

@@ -152,36 +152,36 @@ fn_print_ok_eol_nl(){
 
 # FAIL for end of line
 fn_print_fail_eol(){
-	echo -en "\e[0;31mFAIL\e[0m\n"
+	echo -en "\e[0;31mFAIL\e[0m"
 }
 
 fn_print_fail_eol_nl(){
-	echo -e "\e[0;31mFAIL\e[0m\n"
+	echo -e "\e[0;31mFAIL\e[0m"
 }
 
 # QUERYING for end of line
 fn_print_querying_eol(){
-	echo -en "\e[0;36mQUERYING\e[0m\n"
+	echo -en "\e[0;36mQUERYING\e[0m"
 }
 
 fn_print_querying_eol_nl(){
-	echo -e "\e[0;36mQUERYING\e[0m\n"
+	echo -e "\e[0;36mQUERYING\e[0m"
 }
 
 # CANCELED for end of line
 fn_print_canceled_eol(){
-	echo -en "\e[0;33mCANCELED\e[0m\n"
+	echo -en "\e[0;33mCANCELED\e[0m"
 }
 
 fn_print_canceled_eol_nl(){
-	echo -e "\e[0;33mCANCELED\e[0m\n"
+	echo -e "\e[0;33mCANCELED\e[0m"
 }
 
 # REMOVED for end of line
 fn_print_removed_eol(){
-	echo -en "\e[0;31mREMOVED\e[0m\n"
+	echo -en "\e[0;31mREMOVED\e[0m"
 }
 
 fn_print_removed_eol_nl(){
-	echo -e "\e[0;31mREMOVED\e[0m\n"
+	echo -e "\e[0;31mREMOVED\e[0m"
 }

functions/monitor_gsquery.sh

@@ -26,21 +26,21 @@ if [ -z "${queryport}" ]; then
 	port="${queryport}"
 fi
 
-
+queryattempt=1
+totalseconds=0
 fn_print_info "Querying port: gsquery.py enabled"
 fn_scriptlog "gsquery.py enabled"
 sleep 1
-fn_print_dots "Querying port: ${ip}:${port}: 0/1 : "
+fn_print_dots "Querying port: ${ip}:${port} :${totalseconds}/${queryattempt} : "
 fn_print_querying_eol
-fn_scriptlog "Querying port: ${ip}:${port}: 1 : QUERYING"
+fn_scriptlog "Querying port: ${ip}:${port} : ${queryattempt} : QUERYING"
 sleep 1
 
 
 # Will query up to 4 times every 15 seconds.
 # Servers changing map can return a failure.
 # Will Wait up to 60 seconds to confirm server is down giving server time to change map.
-queryattempt=0
-totalseconds=0
+
 for i in {1..4}; do
 	gsquerycmd=$("${functionsdir}"/gsquery.py -a ${ip} -p 1 -e ${engine} 2>&1)
 	exitcode=$?
@@ -54,7 +54,6 @@ for i in {1..4}; do
 		exit
 	else
 		# Server failed query
-		queryattempt=$((queryattempt + 1))
 		fn_scriptlog "Querying port: ${ip}:${port} : ${queryattempt} : ${gsquerycmd}"
 		seconds=0
 		# Seconds counter
@@ -64,6 +63,7 @@ for i in {1..4}; do
 			totalseconds=$((totalseconds + 1))
 			sleep 1
 			if [ "${seconds}" == "15" ]; then
+				queryattempt=$((queryattempt + 1))
 				fn_print_dots "Querying port: ${ip}:${port} : ${totalseconds}/${queryattempt} : "
 				fn_print_querying_eol
 				fn_scriptlog "Querying port: ${ip}:${port} : ${queryattempt} : QUERYING"