mirror.MikroTik/nymurbd.MikroTik-scripts
1
0
Fork 0
mirror of https://github.com/nymurbd/MikroTik-scripts.git synced 2025-08-02 01:04:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-functions: $ScriptLock: do not exit from global function

Browse source
This commit is contained in:
Christian Hesse 2024-03-05 16:12:36 +01:00
parent 56e97dd60c
commit 1e8918fdaa
57 changed files with 172 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

9
global-functions.rsc
View file

@ -1170,8 +1170,7 @@
# lock script against multiple invocation
:set ScriptLock do={
:local Script [ :tostr $1 ];
:local DoReturn $2;
:local WaitMax ([ :tonum $3 ] * 10);
:local WaitMax ([ :tonum $3 ] * 10);
:global GetRandom20CharAlNum;
:global IfThenElse;
@ -1286,13 +1285,13 @@
:if ([ $IsFirstTicket $Script $MyTicket ] = true && [ $TicketCount $Script ] = [ $JobCount $Script ]) do={
$RemoveTicket $Script $MyTicket;
$CleanupTickets $Script;
:return false;
:return true;
}
$RemoveTicket $Script $MyTicket;
$LogPrintExit2 info $0 ("Script '" . $Script . "' started more than once" . [ $IfThenElse ($WaitCount > 0) \
" and timed out waiting for lock" "" ] . "... Aborting.") [ $IfThenElse ($DoReturn = true) false true ];
:return true;
" and timed out waiting for lock" "" ] . "... Aborting.") false;
:return false;
}
# send notification via NotificationFunctions - expects at least two string arguments