Просмотр исходного кода

Merge pull request #26 from rleibman/master

Reordered checks to make sure dead and inactive get checked first
Jon Schipp 9 лет назад
Родитель
Сommit
d8cbbd4a3e
1 измененных файлов с 9 добавлено и 8 удалено
  1. 9 8
      check_service.sh

+ 9 - 8
check_service.sh

@@ -3,6 +3,7 @@
 # Author: Jon Schipp
 # Author: Jon Schipp
 # 2015-03-09 [Pascal Hegy] - Add sudo for linux
 # 2015-03-09 [Pascal Hegy] - Add sudo for linux
 # 2015-03-09 [Pascal Hegy] - Change USER variable to USERNAME to avoid the use and confusion with the USER env variable
 # 2015-03-09 [Pascal Hegy] - Change USER variable to USERNAME to avoid the use and confusion with the USER env variable
+# 2017-08-30 [Roberto Leibman] - Reordered checks to make sure dead and inactive get checked first
 
 
 ########
 ########
 # Examples:
 # Examples:
@@ -262,6 +263,14 @@ case $STATUS_MSG in
         echo "$STATUS_MSG"
         echo "$STATUS_MSG"
         exit $CRITICAL
         exit $CRITICAL
         ;;
         ;;
+*inactive*)
+        echo "$STATUS_MSG"
+        exit $CRITICAL
+        ;;
+*dead*)
+        echo "$STATUS_MSG"
+        exit $CRITICAL
+        ;;
 *running*)
 *running*)
         echo "$STATUS_MSG"
         echo "$STATUS_MSG"
         exit $OK
         exit $OK
@@ -294,14 +303,6 @@ case $STATUS_MSG in
         echo "$STATUS_MSG"
         echo "$STATUS_MSG"
         exit $CRITICAL
         exit $CRITICAL
         ;;
         ;;
-*inactive*)
-        echo "$STATUS_MSG"
-        exit $CRITICAL
-        ;;
-*dead*)
-        echo "$STATUS_MSG"
-        exit $CRITICAL
-        ;;
 *[aA]ctive*)
 *[aA]ctive*)
         echo "$STATUS_MSG"
         echo "$STATUS_MSG"
         exit $OK
         exit $OK