Merge branch 'exit-error' into next

1 files changed, 6 insertions, 1 deletions

diff --git a/check-health.rsc b/check-health.rsc
index 540336d..495b450 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -11,6 +11,7 @@
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
+:local ExitOK false;
 :do {
   :local ScriptName [ :jobname ];
 
@@ -40,6 +41,7 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
     :error false;
   }
 
@@ -78,6 +80,7 @@
 
   :if ([ :len [ /system/health/find ] ] = 0) do={
     $LogPrint debug $ScriptName ("Your device does not provide any health values.");
+    :set ExitOK true;
     :error true;
   }
 
@@ -175,4 +178,6 @@
     }
     :set ($CheckHealthLast->$Name) $Value;
   }
-} on-error={ }
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
+}