From 1e8918fdaa5a30393e2004d1f5e4dff458936b67 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 5 Mar 2024 16:12:36 +0100
Subject: global-functions: $ScriptLock: do not exit from global function

---
 global-functions.rsc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'global-functions.rsc')

diff --git a/global-functions.rsc b/global-functions.rsc
index b68fbaa..1e36616 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -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
-- 
cgit v1.2.3-54-g00ecf