From 8e4c91ab28974f992326f58c680ed29573415d85 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 26 Jun 2016 18:16:13 +0100
Subject: [PATCH] exitcode shuffle

---
 lgsm/functions/monitor_gsquery.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lgsm/functions/monitor_gsquery.sh b/lgsm/functions/monitor_gsquery.sh
index 4a5522ff2..607f3ac96 100644
--- a/lgsm/functions/monitor_gsquery.sh
+++ b/lgsm/functions/monitor_gsquery.sh
@@ -26,7 +26,7 @@ if [ "${gsquery}" == "yes" ]; then
 	if [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then
 		port=$((port + 1))
 	elif [ "${engine}" == "realvirtuality" ]; then
-		port=$((port + 1))		
+		port=$((port + 1))
 	elif [ "${engine}" == "spark" ]; then
 		port=$((port + 1))
 	fi
@@ -36,7 +36,7 @@ if [ "${gsquery}" == "yes" ]; then
 	fi
 
 	fn_print_info "Querying port: gsquery.py enabled"
-	fn_script_log "Querying port: gsquery.py enabled"
+	fn_script_log_info "Querying port: gsquery.py enabled"
 	sleep 1
 
 	# Will query up to 4 times every 15 seconds.
@@ -46,7 +46,7 @@ if [ "${gsquery}" == "yes" ]; then
 	for queryattempt in {1..5}; do
 		fn_print_dots "Querying port: ${ip}:${port} : ${totalseconds}/${queryattempt} : "
 		fn_print_querying_eol
-		fn_script_log "Querying port: ${ip}:${port} : ${queryattempt} : QUERYING"
+		fn_script_log_info "Querying port: ${ip}:${port} : ${queryattempt} : QUERYING"
 
 		gsquerycmd=$("${functionsdir}"/gsquery.py -a "${ip}" -p "${port}" -e "${engine}" 2>&1)
 		exitcode=$?
@@ -56,18 +56,18 @@ if [ "${gsquery}" == "yes" ]; then
 			# Server OK
 			fn_print_ok "Querying port: ${ip}:${port} : ${queryattempt} : "
 			fn_print_ok_eol_nl
-			fn_script_log "Querying port: ${ip}:${port} : ${queryattempt} : OK"
-			sleep 1
-			exit
+			fn_script_log_pass "Querying port: ${ip}:${port} : ${queryattempt} : OK"
+			exitcode=0
+			break
 		else
 			# Server failed query
-			fn_script_log "Querying port: ${ip}:${port} : ${queryattempt} : ${gsquerycmd}"
+			fn_script_log_info "Querying port: ${ip}:${port} : ${queryattempt} : ${gsquerycmd}"
 
 			if [ "${queryattempt}" == "5" ]; then
 				# Server failed query 4 times confirmed failure
 				fn_print_fail "Querying port: ${ip}:${port} : ${totalseconds}/${queryattempt} : "
 				fn_print_fail_eol_nl
-				fn_script_log "Querying port: ${ip}:${port} : ${queryattempt} : FAIL"
+				fn_script_log_error "Querying port: ${ip}:${port} : ${queryattempt} : FAIL"
 				sleep 1
 
 				# Send alert if enabled