From ff00c27f990b851b9d14f708aecae6087fedc011 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:55:12 +0100
Subject: global-functions: $ExitError: give matching message for functions

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 8941994..6c74c2f 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -428,13 +428,15 @@
 
 # simple macro to print error message on unintentional error
 :set ExitError do={
-  :local ExitOK     [ :tostr $1 ];
-  :local ScriptName [ :tostr $2 ];
+  :local ExitOK [ :tostr $1 ];
+  :local Name   [ :tostr $2 ];
 
+  :global IfThenElse;
   :global LogPrint; 
 
   :if ($ExitOK = "false") do={
-    $LogPrint error $ScriptName ("Script '" . $ScriptName . "' exited with error.");
+    $LogPrint error $Name ([ $IfThenElse ([ :pick $Name 0 1 ] = "\$") \
+        "Function" "Script" ] . " '" . $Name . "' exited with error.");
   }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 8c5bd8f5e2a5943e720e6086c1aec74ddb81eaf1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:02:04 +0100
Subject: global-functions: $ScriptInstallUpdate: use $ExitError to indicate
 unintentional error

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 6c74c2f..743c50e 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1018,7 +1018,7 @@
 }
 
 # install new scripts, update existing scripts
-:set ScriptInstallUpdate do={
+:set ScriptInstallUpdate do={ :do {
   :local Scripts    [ :toarray $1 ];
   :local NewComment [ :tostr   $2 ];
 
@@ -1237,7 +1237,9 @@
     :set GlobalConfigChanges;
     :set GlobalConfigMigration;
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # lock script against multiple invocation
 :set ScriptLock do={
-- 
cgit v1.2.3-70-g09d2


From 5b9031ccca75e7e1ba8479af1ae180ae8422ac74 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 11:06:38 +0100
Subject: global-functions: $SendNotification: use $ExitError to indicate
 unintentional error

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 743c50e..625f8cd 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1374,11 +1374,13 @@
 }
 
 # send notification via NotificationFunctions - expects at least two string arguments
-:set SendNotification do={
+:set SendNotification do={ :do {
   :global SendNotification2;
 
   $SendNotification2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # send notification via NotificationFunctions - expects one array argument
 :set SendNotification2 do={
-- 
cgit v1.2.3-70-g09d2


From 1fe90a6e9aeaba7350f13f52cc9a196a0bc8ca1c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:03:41 +0100
Subject: mode-button: $ModeButtonScheduler: use $ExitError to indicate
 unintentional error

---
 mode-button.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode-button.rsc b/mode-button.rsc
index 2d428ed..90fe80e 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -25,7 +25,7 @@
 
   :if ([ :len $Scheduler ] = 0) do={
     $LogPrint info $ScriptName ("Creating scheduler _ModeButtonScheduler, counting presses...");
-    :global ModeButtonScheduler do={
+    :global ModeButtonScheduler do={ :do {
       :local FuncName $0;
 
       :global ModeButton;
@@ -81,7 +81,9 @@
       } else={
         $LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses.");
       }
-    }
+    } on-error={
+      :global ExitError; $ExitError false $0;
+    } }
     /system/scheduler/add name="_ModeButtonScheduler" \
         on-event=":global ModeButtonScheduler; \$ModeButtonScheduler;" interval=3s;
   } else={
-- 
cgit v1.2.3-70-g09d2


From 5db686a15ccd21ed3a190cd4c9eea0bcc6e56abd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:09:05 +0100
Subject: mod/bridge-port-to: $BridgePortTo: use $ExitError to indicate
 unintentional error

---
 mod/bridge-port-to.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/bridge-port-to.rsc b/mod/bridge-port-to.rsc
index 7dae679..9e7b911 100644
--- a/mod/bridge-port-to.rsc
+++ b/mod/bridge-port-to.rsc
@@ -10,7 +10,7 @@
 
 :global BridgePortTo;
 
-:set BridgePortTo do={
+:set BridgePortTo do={ :do {
   :local BridgePortTo [ :tostr $1 ];
 
   :global IfThenElse;
@@ -65,4 +65,6 @@
     $LogPrint info $0 ("Re-enabling interfaces...");
     /interface/ethernet/enable $InterfaceReEnable;
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
-- 
cgit v1.2.3-70-g09d2


From 495232b299bafadc4d21551f094c3c42fa090f57 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:09:48 +0100
Subject: mod/bridge-port-vlan: $BridgePortVlan: use $ExitError to indicate
 unintentional error

---
 mod/bridge-port-vlan.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/bridge-port-vlan.rsc b/mod/bridge-port-vlan.rsc
index c9f55ae..18fa2db 100644
--- a/mod/bridge-port-vlan.rsc
+++ b/mod/bridge-port-vlan.rsc
@@ -10,7 +10,7 @@
 
 :global BridgePortVlan;
 
-:global BridgePortVlan do={
+:global BridgePortVlan do={ :do {
   :local ConfigTo [ :tostr $1 ];
 
   :global IfThenElse;
@@ -74,4 +74,6 @@
     $LogPrint info $0 ("Re-enabling interfaces...");
     /interface/ethernet/enable $InterfaceReEnable;
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
-- 
cgit v1.2.3-70-g09d2


From 05cb87f475ffc3f9fdc1fa6988925e79a3dacd38 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:10:08 +0100
Subject: mod/inspectvar: $InspectVar: use $ExitError to indicate unintentional
 error

---
 mod/inspectvar.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc
index 73205b2..0209214 100644
--- a/mod/inspectvar.rsc
+++ b/mod/inspectvar.rsc
@@ -12,11 +12,13 @@
 :global InspectVarReturn;
 
 # inspect variable and print on terminal
-:set InspectVar do={
+:set InspectVar do={ :do {
   :global InspectVarReturn;
 
   :put [ :tocrlf [ $InspectVarReturn $1 ] ];
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # inspect variable and return formatted string
 :set InspectVarReturn do={
-- 
cgit v1.2.3-70-g09d2


From 34172e4c78cc5a6d0fe99df279e42a8794f84c94 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:10:27 +0100
Subject: mod/ipcalc: $IPCalc: use $ExitError to indicate unintentional error

---
 mod/ipcalc.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/ipcalc.rsc b/mod/ipcalc.rsc
index 003bdc3..021cd30 100644
--- a/mod/ipcalc.rsc
+++ b/mod/ipcalc.rsc
@@ -12,7 +12,7 @@
 :global IPCalcReturn;
 
 # print netmask, network, min host, max host and broadcast
-:set IPCalc do={
+:set IPCalc do={ :do {
   :local Input [ :tostr $1 ];
 
   :global FormatLine;
@@ -27,7 +27,9 @@
     [ $FormatLine "HostMin" ($Values->"hostmin") ] . "\n" . \
     [ $FormatLine "HostMax" ($Values->"hostmax") ] . "\n" . \
     [ $FormatLine "Broadcast" ($Values->"broadcast") ]) ];
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # calculate and return netmask, network, min host, max host and broadcast
 :set IPCalcReturn do={
-- 
cgit v1.2.3-70-g09d2


From 5450618723dabf9d42857047ea906c9fc87886dd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 08:51:50 +0100
Subject: mod/notification-email: $FlushEmailQueue: use $ExitError to indicate
 unintentional error

---
 mod/notification-email.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index 3d62ddf..ff4188c 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -34,7 +34,7 @@
 }
 
 # flush e-mail queue
-:set FlushEmailQueue do={
+:set FlushEmailQueue do={ :do {
   :global EmailQueue;
 
   :global EitherOr;
@@ -113,7 +113,9 @@
   } else={
     /system/scheduler/set interval=1m comment="Waiting for retry..." $Scheduler;
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # generate filter for log-forward
 :set LogForwardFilterLogForwarding do={
-- 
cgit v1.2.3-70-g09d2


From 1927dc505a88ef5ecb86d1d925cf44a5225b4b7c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 11:09:44 +0100
Subject: mod/notification-email: $SendEMail: use $ExitError to indicate
 unintentional error

---
 mod/notification-email.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index ff4188c..e51779b 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -226,11 +226,13 @@
 }
 
 # send notification via e-mail - expects at least two string arguments
-:set SendEMail do={
+:set SendEMail do={ :do {
   :global SendEMail2;
 
   $SendEMail2 ({ origin=$0; subject=$1; message=$2; link=$3 });
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # send notification via e-mail - expects one array argument
 :set SendEMail2 do={
-- 
cgit v1.2.3-70-g09d2


From 1994b23e462c02ee71d5cb9db21d0e6075010c3c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 08:56:35 +0100
Subject: mod/notification-matrix: $FlushMatrixQueue: use $ExitError to
 indicate unintentional error

---
 mod/notification-matrix.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/notification-matrix.rsc b/mod/notification-matrix.rsc
index 3adc1df..751967c 100644
--- a/mod/notification-matrix.rsc
+++ b/mod/notification-matrix.rsc
@@ -18,7 +18,7 @@
 :global SetupMatrixJoinRoom;
 
 # flush Matrix queue
-:set FlushMatrixQueue do={
+:set FlushMatrixQueue do={ :do {
   :global MatrixQueue;
 
   :global IsFullyConnected;
@@ -57,7 +57,9 @@
     /system/scheduler/remove [ find where name="_FlushMatrixQueue" ];
     :set MatrixQueue;
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # send notification via Matrix - expects one array argument
 :set ($NotificationFunctions->"matrix") do={
-- 
cgit v1.2.3-70-g09d2


From de9dee83bea855a893594e0d58ca609872f75072 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 11:10:03 +0100
Subject: mod/notification-matrix: $SendMatrix: use $ExitError to indicate
 unintentional error

---
 mod/notification-matrix.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/notification-matrix.rsc b/mod/notification-matrix.rsc
index 751967c..14f369d 100644
--- a/mod/notification-matrix.rsc
+++ b/mod/notification-matrix.rsc
@@ -166,11 +166,13 @@
 }
 
 # send notification via Matrix - expects at least two string arguments
-:set SendMatrix do={
+:set SendMatrix do={ :do {
   :global SendMatrix2;
 
   $SendMatrix2 ({ origin=$0; subject=$1; message=$2; link=$3 });
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # send notification via Matrix - expects one array argument
 :set SendMatrix2 do={
-- 
cgit v1.2.3-70-g09d2


From aac723e2a1eede3649c5f3b4bbe67af0e951063a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 08:57:01 +0100
Subject: mod/notification-ntfy: $FlushNtfyQueue: use $ExitError to indicate
 unintentional error

---
 mod/notification-ntfy.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/notification-ntfy.rsc b/mod/notification-ntfy.rsc
index b2bb280..5fdeedf 100644
--- a/mod/notification-ntfy.rsc
+++ b/mod/notification-ntfy.rsc
@@ -15,7 +15,7 @@
 :global SendNtfy2;
 
 # flush ntfy queue
-:set FlushNtfyQueue do={
+:set FlushNtfyQueue do={ :do {
   :global NtfyQueue;
   :global NtfyMessageIDs;
 
@@ -52,7 +52,9 @@
     /system/scheduler/remove [ find where name="_FlushNtfyQueue" ];
     :set NtfyQueue;
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # send notification via ntfy - expects one array argument
 :set ($NotificationFunctions->"ntfy") do={
-- 
cgit v1.2.3-70-g09d2


From e76ae11b029169e971f7313b17d5c43589fa8170 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 11:10:24 +0100
Subject: mod/notification-ntfy: $SendNtfy: use $ExitError to indicate
 unintentional error

---
 mod/notification-ntfy.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/notification-ntfy.rsc b/mod/notification-ntfy.rsc
index 5fdeedf..7e0234b 100644
--- a/mod/notification-ntfy.rsc
+++ b/mod/notification-ntfy.rsc
@@ -134,11 +134,13 @@
 }
 
 # send notification via ntfy - expects at least two string arguments
-:set SendNtfy do={
+:set SendNtfy do={ :do {
   :global SendNtfy2;
 
   $SendNtfy2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # send notification via ntfy - expects one array argument
 :set SendNtfy2 do={
-- 
cgit v1.2.3-70-g09d2


From e89867be1533cd561bf61b65f3019946e2ceeee1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 08:57:20 +0100
Subject: mod/notification-telegram: $FlushTelegramQueue: use $ExitError to
 indicate unintentional error

---
 mod/notification-telegram.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/notification-telegram.rsc b/mod/notification-telegram.rsc
index 671bd1c..993782d 100644
--- a/mod/notification-telegram.rsc
+++ b/mod/notification-telegram.rsc
@@ -15,7 +15,7 @@
 :global SendTelegram2;
 
 # flush telegram queue
-:set FlushTelegramQueue do={
+:set FlushTelegramQueue do={ :do {
   :global TelegramQueue;
   :global TelegramMessageIDs;
 
@@ -56,7 +56,9 @@
     /system/scheduler/remove [ find where name="_FlushTelegramQueue" ];
     :set TelegramQueue;
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # send notification via telegram - expects one array argument
 :set ($NotificationFunctions->"telegram") do={
-- 
cgit v1.2.3-70-g09d2


From 4968b79fc1142c9bfdbfe93c8f917cfdd7f51790 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 11:10:43 +0100
Subject: mod/notification-telegram: $SendTelegram: use $ExitError to indicate
 unintentional error

---
 mod/notification-telegram.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/notification-telegram.rsc b/mod/notification-telegram.rsc
index 993782d..7d75b8b 100644
--- a/mod/notification-telegram.rsc
+++ b/mod/notification-telegram.rsc
@@ -182,11 +182,13 @@
 }
 
 # send notification via telegram - expects at least two string arguments
-:set SendTelegram do={
+:set SendTelegram do={ :do {
   :global SendTelegram2;
 
   $SendTelegram2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # send notification via telegram - expects one array argument
 :set SendTelegram2 do={
-- 
cgit v1.2.3-70-g09d2


From 73e0ac75f10019794a2692371ca08a46bea69eb9 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:10:44 +0100
Subject: mod/scriptrunonce: $ScriptRunOnce: use $ExitError to indicate
 unintentional error

---
 mod/scriptrunonce.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/scriptrunonce.rsc b/mod/scriptrunonce.rsc
index 3d5dce9..c8dcf26 100644
--- a/mod/scriptrunonce.rsc
+++ b/mod/scriptrunonce.rsc
@@ -11,7 +11,7 @@
 :global ScriptRunOnce;
 
 # fetch and run script(s) once
-:set ScriptRunOnce do={
+:set ScriptRunOnce do={ :do {
   :local Scripts [ :toarray $1 ];
 
   :global ScriptRunOnceBaseUrl;
@@ -49,4 +49,6 @@
       }
     }
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
-- 
cgit v1.2.3-70-g09d2


From 1788c0599865ee9cb7e5015e260d7e4a49abf581 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:11:39 +0100
Subject: mod/ssh-keys-import: $SSHKeysImport: use $ExitError to indicate
 unintentional error

---
 mod/ssh-keys-import.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index c7b2788..b2f1d20 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -12,7 +12,7 @@
 :global SSHKeysImportFile;
 
 # import single key passed as string
-:set SSHKeysImport do={
+:set SSHKeysImport do={ :do {
   :local Key  [ :tostr $1 ];
   :local User [ :tostr $2 ];
 
@@ -64,7 +64,9 @@
     /file/remove "tmpfs/ssh-keys-import";
     :return false;
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # import keys from a file
 :set SSHKeysImportFile do={
-- 
cgit v1.2.3-70-g09d2


From 210ef26b93364f4b69cde9ff34139d51572357ee Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 9 Dec 2024 09:11:56 +0100
Subject: mod/ssh-keys-import: $SSHKeysImportFile: use $ExitError to indicate
 unintentional error

---
 mod/ssh-keys-import.rsc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index b2f1d20..583e827 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -69,7 +69,7 @@
 } }
 
 # import keys from a file
-:set SSHKeysImportFile do={
+:set SSHKeysImportFile do={ :do {
   :local FileName [ :tostr $1 ];
   :local User     [ :tostr $2 ];
 
@@ -108,4 +108,6 @@
       $LogPrint warning $0 ("SSH key of type '" . $KeyVal->0 . "' is not supported.");
     }
   }
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
-- 
cgit v1.2.3-70-g09d2