aboutsummaryrefslogtreecommitdiffstats
path: root/check-health.rsc
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-03-06 23:53:50 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-03-12 15:27:15 +0100
commit6fd39bd3c5d7c3fe5dca9e92275f60e0b3217f03 (patch)
tree7ced2fbdb536447b537a967e945600ba6dd78c8a /check-health.rsc
parentb86d6314868596dacdf422db80ef0ff27c61c644 (diff)
parentf0856c264e07804a229668268a457f2154cb373a (diff)
Merge branch 'do-with-on-error' into nextrouteros-7.15beta4-2
Diffstat (limited to 'check-health.rsc')
-rw-r--r--check-health.rsc12
1 files changed, 5 insertions, 7 deletions
diff --git a/check-health.rsc b/check-health.rsc
index df76d25..91330fc 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -11,8 +11,8 @@
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-:local Main do={
- :local ScriptName [ :tostr $1 ];
+:do {
+ :local ScriptName [ :jobname ];
:global CheckHealthCPUUtilization;
:global CheckHealthCPUUtilizationNotified;
@@ -40,7 +40,7 @@
}
:if ([ $ScriptLock $ScriptName ] = false) do={
- :return false;
+ :error false;
}
:local Resource [ /system/resource/get ];
@@ -78,7 +78,7 @@
:if ([ :len [ /system/health/find ] ] = 0) do={
$LogPrintExit2 debug $ScriptName ("Your device does not provide any health values.") false;
- :return true;
+ :error true;
}
:if ([ :typeof $CheckHealthLast ] != "array") do={
@@ -175,6 +175,4 @@
}
:set ($CheckHealthLast->$Name) $Value;
}
-}
-
-$Main [ :jobname ];
+} on-error={ }