Crash_Override/routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts synced 2024-05-14 08:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

global-functions: $ScriptLock: cleanup in dedicated function

Browse source
This commit is contained in:
Christian Hesse 2021-12-09 22:28:06 +01:00
parent 327740d255
commit b423e6ed0f
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
global-functions
View file

@ -945,18 +945,26 @@
:global ScriptLockOrder; :global ScriptLockOrder;
:local Count 0;
:foreach Id,Ticket in=($ScriptLockOrder->$Script) do={ :foreach Id,Ticket in=($ScriptLockOrder->$Script) do={
:if (($ScriptLockOrder->$Script->$Id) = $Remove) do={ :if (($ScriptLockOrder->$Script->$Id) = $Remove) do={
:set ($ScriptLockOrder->$Script->$Id); :set ($ScriptLockOrder->$Script->$Id);
} }
:if ([ :typeof ($ScriptLockOrder->$Script->$Id) ] != "nothing") do={
:set Count ($Count + 1);
} }
} }
:if ($Count = 0) do={ :local CleanupTickets do={
:local Script [ :tostr $1 ];
:global ScriptLockOrder;
:local Clean true;
:foreach Ticket in=($ScriptLockOrder->$Script) do={
:if ([ :typeof $Ticket ] != "nothing") do={
:set Clean false;
}
}
:if ($Clean = true) do={
:set ($ScriptLockOrder->$Script) [ :toarray "" ]; :set ($ScriptLockOrder->$Script) [ :toarray "" ];
} }
} }
@ -986,6 +994,7 @@
:if ([ $IsFirstTicket $Script $MyTicket ] = true && [ $TicketCount $Script ] = [ $JobCount $Script ]) do={ :if ([ $IsFirstTicket $Script $MyTicket ] = true && [ $TicketCount $Script ] = [ $JobCount $Script ]) do={
$RemoveTicket $Script $MyTicket; $RemoveTicket $Script $MyTicket;
$CleanupTickets $Script;
:return false; :return false;
} }