From e229cb49bcc283c63062cecca69b2e023692c554 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 14 Aug 2020 11:40:21 -0400 Subject: [PATCH] logic changes --- setup/so-functions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 0d912e82b..e857f71e1 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1376,12 +1376,12 @@ check_service_status() { echo "Checking service $service_name status" >> "$setup_log" 2>&1 systemctl status $service_name >> "$setup_log" 2>&1 local status=$? - #true service is running false if not + #true if there is an issue with the service false if it is running properly if [ $status -gt 0 ]; then - echo "$service_name is running" >> "$setup_log" 2>&1 + echo "$service_name not is running" >> "$setup_log" 2>&1 status=1 else - echo "$service_name is not running" >> "$setup_log" 2>&1 + echo "$service_name is running" >> "$setup_log" 2>&1 status=0 fi @@ -1439,7 +1439,7 @@ salt_checkin() { echo "Stopping service $service" >> "$setup_log" 2>&1 systemctl stop "$service" >> "$setup_log" 2>&1 LOOP_COUNT=0 - while (( $(check_service_status $service) )); do + while ! (( $(check_service_status $service) )); do echo "$service still running" >> "$setup_log" 2>&1 if [ $LOOP_COUNT -gt 60 ]; then echo "$service could not be stopped in 60 seconds, exiting" >> "$setup_log" 2>&1 @@ -1456,7 +1456,7 @@ salt_checkin() { echo "Starting service $service" >> "$setup_log" 2>&1 systemctl start "$service" >> "$setup_log" 2>&1 LOOP_COUNT=0 - while ! (( $(check_service_status $service) )); do + while (( $(check_service_status $service) )); do echo "$service still not running" >> "$setup_log" 2>&1 if [ $LOOP_COUNT -gt 60 ]; then echo "$service could not be started in 60 seconds, exiting" >> "$setup_log" 2>&1