1 files changed, 22 insertions, 11 deletions
diff --git a/log-forward.rsc b/log-forward.rsc
index 7abcb4d..be7eff7 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -1,17 +1,18 @@
 #!rsc by RouterOS
 # RouterOS script: log-forward
-# Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2020-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.13
+# requires RouterOS, version=7.15
 #
 # forward log messages via notification
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/log-forward.md
+# https://rsc.eworm.de/doc/log-forward.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
-:do {
+:local ExitOK false;
+:onerror Err {
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -33,6 +34,7 @@
   :global SymbolForNotification;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
     :error false;
   }
 
@@ -43,6 +45,7 @@
   :if ($LogForwardRateLimit > 30) do={
     :set LogForwardRateLimit ($LogForwardRateLimit - 1);
     $LogPrint info $ScriptName ("Rate limit in action, not forwarding logs, if any!");
+    :set ExitOK true;
     :error false;
   }
 
@@ -54,6 +57,11 @@
   :local MessageVal;
   :local MessageDups ({});
 
+  :set LogForwardFilter [ $EitherOr $LogForwardFilter [] ];
+  :set LogForwardFilterMessage [ $EitherOr $LogForwardFilterMessage [] ];
+  :set LogForwardInclude [ $EitherOr $LogForwardInclude [] ];
+  :set LogForwardIncludeMessage [ $EitherOr $LogForwardIncludeMessage [] ];
+
   :local LogForwardFilterLogForwardingCached [ $EitherOr [ $LogForwardFilterLogForwarding ] ("\$^") ];
   :foreach Message in=[ /log/find where (!(message="") and \
       !(message~$LogForwardFilterLogForwardingCached) and \
@@ -94,9 +102,12 @@
         [ $IfThenElse ($Duplicates = true) (" Multi-repeated messages have been skipped.") ] . \
         [ $IfThenElse ($LogForwardRateLimit > 30) ("\nRate limit in action, delaying forwarding.") ] . \
         "\n" . $Messages) });
-
-    :set LogForwardLast ($MessageVal->".id");
   } else={
     :set LogForwardRateLimit [ $MAX 0 ($LogForwardRateLimit - 1) ];
   }
-} on-error={ }
+
+  :local LogAll [ /log/find ];
+  :set LogForwardLast ($LogAll->([ :len $LogAll ] - 1) );
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+}