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

lease-script: 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 6f91c97b7f
commit 6546e7f085
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lease-script.rsc
View file

@ -11,12 +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 ];
:local leaseActIP [ :tostr $2 ];
:local leaseActMAC [ :tostr $2 ];
:local leaseServerName [ :tostr $2 ];
:local leaseBound [ :tostr $2 ];
:global Grep; :global Grep;
:global IfThenElse; :global IfThenElse;
@ -35,12 +31,12 @@
"de" "" ] . "assigned lease " . $leaseActIP . " to " . $leaseActMAC) false; "de" "" ] . "assigned lease " . $leaseActIP . " to " . $leaseActMAC) false;
:if ([ $ScriptLock $ScriptName 10 ] = false) do={ :if ([ $ScriptLock $ScriptName 10 ] = false) do={
:return false; :error false;
} }
:if ([ :len [ /system/script/job/find where script=$ScriptName ] ] > 1) do={ :if ([ :len [ /system/script/job/find where script=$ScriptName ] ] > 1) do={
$LogPrintExit2 debug $ScriptName ("More invocations are waiting, exiting early.") false; $LogPrintExit2 debug $ScriptName ("More invocations are waiting, exiting early.") false;
:return true; :error true;
} }
:local RunOrder ({}); :local RunOrder ({});
@ -59,6 +55,4 @@
$LogPrintExit2 warning $ScriptName ("Running script '" . $Script . "' failed!") false; $LogPrintExit2 warning $ScriptName ("Running script '" . $Script . "' failed!") false;
} }
} }
} } on-error={ }
$Main [ :jobname ] $leaseActIP $leaseActMAC $leaseServerName $leaseBound;