mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-26 05:44:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

log-forward: drop main function, use :do with on-error

Browse source
This commit is contained in:
Christian Hesse 2024-03-06 15:28:55 +01:00
parent 6546e7f085
commit 52f54baea0
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
log-forward.rsc
View file

@ -11,8 +11,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global Identity; :global Identity;
:global LogForwardFilter; :global LogForwardFilter;
@ -33,7 +33,7 @@
:global SymbolForNotification; :global SymbolForNotification;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
:if ([ :typeof $LogForwardRateLimit ] = "nothing") do={ :if ([ :typeof $LogForwardRateLimit ] = "nothing") do={
@ -43,7 +43,7 @@
:if ($LogForwardRateLimit > 30) do={ :if ($LogForwardRateLimit > 30) do={
:set LogForwardRateLimit ($LogForwardRateLimit - 1); :set LogForwardRateLimit ($LogForwardRateLimit - 1);
$LogPrintExit2 info $ScriptName ("Rate limit in action, not forwarding logs, if any!") false; $LogPrintExit2 info $ScriptName ("Rate limit in action, not forwarding logs, if any!") false;
:return true; :error false;
} }
:local Count 0; :local Count 0;
@ -99,6 +99,4 @@
} else={ } else={
:set LogForwardRateLimit [ $MAX 0 ($LogForwardRateLimit - 1) ]; :set LogForwardRateLimit [ $MAX 0 ($LogForwardRateLimit - 1) ];
} }
} } on-error={ }
$Main [ :jobname ];