1 files changed, 21 insertions, 11 deletions

diff --git a/mode-button.rsc b/mode-button.rsc
index 3bd922b..edc5f40 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -1,16 +1,18 @@
 #!rsc by RouterOS
 # RouterOS script: mode-button
-# Copyright (c) 2018-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2018-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.14
+# requires RouterOS, version=7.15
+# requires device-mode, scheduler
 #
 # act on multiple mode and reset button presses
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/mode-button.md
+# https://rsc.eworm.de/doc/mode-button.md
 
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
+:local ExitOK false;
 :do {
   :local ScriptName [ :jobname ];
 
@@ -24,7 +26,9 @@
 
   :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;
 
       :global LogPrint;
@@ -53,7 +57,7 @@
 
       :if ([ :len $Code ] > 0) do={
         :if ([ $ValidateSyntax $Code ] = true) do={
-          $LogPrint info $0 ("Acting on " . $Count . " mode-button presses: " . $Code);
+          $LogPrint info $FuncName ("Acting on " . $Count . " mode-button presses: " . $Code);
 
           :for I from=1 to=$Count do={
             $LEDInvert;
@@ -68,19 +72,25 @@
           :do {
             [ :parse $Code ];
           } on-error={
-            $LogPrint warning $0 ("The code for " . $Count . " mode-button presses failed with runtime error!");
+            $LogPrint warning $FuncName \
+                ("The code for " . $Count . " mode-button presses failed with runtime error!");
           }
         } else={
-          $LogPrint warning $0 ("The code for " . $Count . " mode-button presses failed syntax validation!");
+          $LogPrint warning $FuncName \
+              ("The code for " . $Count . " mode-button presses failed syntax validation!");
         }
       } else={
-        $LogPrint info $0 ("No action defined for " . $Count . " mode-button presses.");
+        $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={
     $LogPrint debug $ScriptName ("Updating scheduler _ModeButtonScheduler...");
     /system/scheduler/set $Scheduler start-time=[ /system/clock/get time ];
   }
-} on-error={ }
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
+}