mirror.MikroTik/eworm-de.routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2025-06-20 17:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

netwatch-notify: :do ... on-error=... -> :onerror ... do=...

Browse source
This commit is contained in:
Christian Hesse 2025-05-08 10:09:59 +02:00
parent a523f97938
commit fefe59751f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
netwatch-notify.rsc
View file

@ -38,10 +38,10 @@
:global ValidateSyntax; :global ValidateSyntax;
:if ([ $ValidateSyntax $Hook ] = true) do={ :if ([ $ValidateSyntax $Hook ] = true) do={
:do { onerror Err {
[ :parse $Hook ]; [ :parse $Hook ];
} on-error={ } do={
$LogPrint warning $ScriptName ("The " . $State . "-hook for " . $Type . " '" . $Name . "' failed to run."); $LogPrint warning $ScriptName ("The " . $State . "-hook for " . $Type . " '" . $Name . "' failed to run: " . $Err);
:return ("The hook failed to run."); :return ("The hook failed to run.");
} }
} else={ } else={
@ -107,7 +107,7 @@
:if ([ :typeof ($HostInfo->"resolve") ] = "str") do={ :if ([ :typeof ($HostInfo->"resolve") ] = "str") do={
:if ([ $IsDNSResolving ] = true) do={ :if ([ $IsDNSResolving ] = true) do={
:do { :onerror Err {
:local Resolve [ :resolve type=[ $IfThenElse ([ :typeof ($HostVal->"host") ] = "ip") \ :local Resolve [ :resolve type=[ $IfThenElse ([ :typeof ($HostVal->"host") ] = "ip") \
"ipv4" "ipv6" ] ($HostInfo->"resolve") ]; "ipv4" "ipv6" ] ($HostInfo->"resolve") ];
:if ($Resolve != $HostVal->"host") do={ :if ($Resolve != $HostVal->"host") do={
@ -121,13 +121,13 @@
:set ($HostVal->"status") "unknown"; :set ($HostVal->"status") "unknown";
} }
} }
} on-error={ } do={
:set ($Metric->"resolve-failcnt") ($Metric->"resolve-failcnt" + 1); :set ($Metric->"resolve-failcnt") ($Metric->"resolve-failcnt" + 1);
:if ($Metric->"resolve-failcnt" = 3) do={ :if ($Metric->"resolve-failcnt" = 3) do={
$LogPrint [ $IfThenElse ($HostInfo->"no-resolve-fail" != true) warning debug ] \ $LogPrint [ $IfThenElse ($HostInfo->"no-resolve-fail" != true) warning debug ] \
$ScriptName ("Resolving name '" . $HostInfo->"resolve" . [ $IfThenElse \ $ScriptName ("Resolving name '" . $HostInfo->"resolve" . [ $IfThenElse \
($HostInfo->"resolve" != $HostInfo->"name") ("' for " . $Type . " '" . \ ($HostInfo->"resolve" != $HostInfo->"name") ("' for " . $Type . " '" . \
$HostInfo->"name") "" ] . "' failed."); $HostInfo->"name") "" ] . "' failed: " . $Err);
} }
} }
} }