Merge branch 'main-function' into next

1 files changed, 75 insertions, 70 deletions

diff --git a/log-forward.rsc b/log-forward.rsc
index 69fa1f1..13b490e 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -8,89 +8,94 @@
 # forward log messages via notification
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/log-forward.md
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global Identity;
-:global LogForwardFilter;
-:global LogForwardFilterMessage;
-:global LogForwardInclude;
-:global LogForwardIncludeMessage;
-:global LogForwardLast;
-:global LogForwardRateLimit;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-:global EitherOr;
-:global HexToNum;
-:global IfThenElse;
-:global LogForwardFilterLogForwarding;
-:global LogPrintExit2;
-:global MAX;
-:global ScriptLock;
-:global SendNotification2;
-:global SymbolForNotification;
+  :global Identity;
+  :global LogForwardFilter;
+  :global LogForwardFilterMessage;
+  :global LogForwardInclude;
+  :global LogForwardIncludeMessage;
+  :global LogForwardLast;
+  :global LogForwardRateLimit;
 
-$ScriptLock $0;
+  :global EitherOr;
+  :global HexToNum;
+  :global IfThenElse;
+  :global LogForwardFilterLogForwarding;
+  :global LogPrintExit2;
+  :global MAX;
+  :global ScriptLock;
+  :global SendNotification2;
+  :global SymbolForNotification;
 
-:if ([ :typeof $LogForwardRateLimit ] = "nothing") do={
-  :set LogForwardRateLimit 0;
-}
+  $ScriptLock $ScriptName;
 
-:if ($LogForwardRateLimit > 30) do={
-  :set LogForwardRateLimit ($LogForwardRateLimit - 1);
-  $LogPrintExit2 info $0 ("Rate limit in action, not forwarding logs, if any!") true;
-}
+  :if ([ :typeof $LogForwardRateLimit ] = "nothing") do={
+    :set LogForwardRateLimit 0;
+  }
 
-:local Count 0;
-:local Duplicates false;
-:local Last [ $IfThenElse ([ :len $LogForwardLast ] > 0) [ $HexToNum $LogForwardLast ] -1 ];
-:local Messages "";
-:local Warning false;
-:local MessageVal;
-:local MessageDups ({});
+  :if ($LogForwardRateLimit > 30) do={
+    :set LogForwardRateLimit ($LogForwardRateLimit - 1);
+    $LogPrintExit2 info $ScriptName ("Rate limit in action, not forwarding logs, if any!") true;
+  }
 
-:local LogForwardFilterLogForwardingCached [ $EitherOr [ $LogForwardFilterLogForwarding ] ("\$^") ];
-:foreach Message in=[ /log/find where (!(message="") and \
-    !(message~$LogForwardFilterLogForwardingCached) and \
-    !(topics~$LogForwardFilter) and !(message~$LogForwardFilterMessage)) or \
-    topics~$LogForwardInclude or message~$LogForwardIncludeMessage ] do={
-  :set MessageVal [ /log/get $Message ];
-  :local Bullet "information";
+  :local Count 0;
+  :local Duplicates false;
+  :local Last [ $IfThenElse ([ :len $LogForwardLast ] > 0) [ $HexToNum $LogForwardLast ] -1 ];
+  :local Messages "";
+  :local Warning false;
+  :local MessageVal;
+  :local MessageDups ({});
 
-  :if ($Last < [ $HexToNum ($MessageVal->".id") ]) do={
-    :local DupCount ($MessageDups->($MessageVal->"message"));
-    :if ($MessageVal->"topics" ~ "(warning)") do={
-      :set Warning true;
-      :set Bullet "large-orange-circle";
-    }
-    :if ($MessageVal->"topics" ~ "(emergency|alert|critical|error)") do={
-      :set Warning true;
-      :set Bullet "large-red-circle";
-    }
-    :if ($DupCount < 3) do={
-      :set Messages ($Messages . "\n" . [ $SymbolForNotification $Bullet ] . \
-        $MessageVal->"time" . " " . [ :tostr ($MessageVal->"topics") ] . " " . $MessageVal->"message");
-    } else={
-      :set Duplicates true;
+  :local LogForwardFilterLogForwardingCached [ $EitherOr [ $LogForwardFilterLogForwarding ] ("\$^") ];
+  :foreach Message in=[ /log/find where (!(message="") and \
+      !(message~$LogForwardFilterLogForwardingCached) and \
+      !(topics~$LogForwardFilter) and !(message~$LogForwardFilterMessage)) or \
+      topics~$LogForwardInclude or message~$LogForwardIncludeMessage ] do={
+    :set MessageVal [ /log/get $Message ];
+    :local Bullet "information";
+
+    :if ($Last < [ $HexToNum ($MessageVal->".id") ]) do={
+      :local DupCount ($MessageDups->($MessageVal->"message"));
+      :if ($MessageVal->"topics" ~ "(warning)") do={
+        :set Warning true;
+        :set Bullet "large-orange-circle";
+      }
+      :if ($MessageVal->"topics" ~ "(emergency|alert|critical|error)") do={
+        :set Warning true;
+        :set Bullet "large-red-circle";
+      }
+      :if ($DupCount < 3) do={
+        :set Messages ($Messages . "\n" . [ $SymbolForNotification $Bullet ] . \
+          $MessageVal->"time" . " " . [ :tostr ($MessageVal->"topics") ] . " " . $MessageVal->"message");
+      } else={
+        :set Duplicates true;
+      }
+      :set ($MessageDups->($MessageVal->"message")) ($DupCount + 1);
+      :set Count ($Count + 1);
     }
-    :set ($MessageDups->($MessageVal->"message")) ($DupCount + 1);
-    :set Count ($Count + 1);
   }
-}
 
-:if ($Count > 0) do={
-  :set LogForwardRateLimit ($LogForwardRateLimit + 10);
+  :if ($Count > 0) do={
+    :set LogForwardRateLimit ($LogForwardRateLimit + 10);
 
-  $SendNotification2 ({ origin=$0; \
-    subject=([ $SymbolForNotification [ $IfThenElse ($Warning = true) "warning-sign" "memo" ] ] . \
-      "Log Forwarding"); \
-    message=("The log on " . $Identity . " contains " . [ $IfThenElse ($Count = 1) "this message" \
-      ("these " . $Count . " messages") ] . " after " . [ /system/resource/get uptime ] . " uptime." . \
-      [ $IfThenElse ($Duplicates = true) (" Multi-repeated messages have been skipped.") ] . \
-      [ $IfThenElse ($LogForwardRateLimit > 30) ("\nRate limit in action, delaying forwarding.") ] . \
-      "\n" . $Messages) });
+    $SendNotification2 ({ origin=$ScriptName; \
+      subject=([ $SymbolForNotification [ $IfThenElse ($Warning = true) "warning-sign" "memo" ] ] . \
+        "Log Forwarding"); \
+      message=("The log on " . $Identity . " contains " . [ $IfThenElse ($Count = 1) "this message" \
+        ("these " . $Count . " messages") ] . " after " . [ /system/resource/get uptime ] . " uptime." . \
+        [ $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) ];
+    :set LogForwardLast ($MessageVal->".id");
+  } else={
+    :set LogForwardRateLimit [ $MAX 0 ($LogForwardRateLimit - 1) ];
+  }
 }
+
+$Main [ :jobname ];