Merge branch 'main-function' into next

1 files changed, 26 insertions, 21 deletions

diff --git a/ospf-to-leds.rsc b/ospf-to-leds.rsc
index 47e1d41..a462d2a 100644
--- a/ospf-to-leds.rsc
+++ b/ospf-to-leds.rsc
@@ -8,33 +8,38 @@
 # visualize ospf instance state via leds
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/ospf-to-leds.md
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global LogPrintExit2;
-:global ParseKeyValueStore;
-:global ScriptLock;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
+  :global LogPrintExit2;
+  :global ParseKeyValueStore;
+  :global ScriptLock;
 
-:foreach Instance in=[ /routing/ospf/instance/find where comment~"^ospf-to-leds," ] do={
-  :local InstanceVal [ /routing/ospf/instance/get $Instance ];
-  :local LED ([ $ParseKeyValueStore ($InstanceVal->"comment") ]->"leds");
-  :local LEDType [ /system/leds/get [ find where leds=$LED ] type ];
+  $ScriptLock $ScriptName;
 
-  :local NeighborCount 0;
-  :foreach Area in=[ /routing/ospf/area/find where instance=($InstanceVal->"name") ] do={
-    :local AreaName [ /routing/ospf/area/get $Area name ];
-    :set NeighborCount ($NeighborCount + [ :len [ /routing/ospf/neighbor/find where area=$AreaName ] ]);
-  }
+  :foreach Instance in=[ /routing/ospf/instance/find where comment~"^ospf-to-leds," ] do={
+    :local InstanceVal [ /routing/ospf/instance/get $Instance ];
+    :local LED ([ $ParseKeyValueStore ($InstanceVal->"comment") ]->"leds");
+    :local LEDType [ /system/leds/get [ find where leds=$LED ] type ];
 
-  :if ($NeighborCount > 0 && $LEDType = "off") do={
-    $LogPrintExit2 info $0 ("OSPF instance " . $InstanceVal->"name" . " has " . $NeighborCount . " neighbors, led on!") false;
-    /system/leds/set type=on [ find where leds=$LED ];
-  }
-  :if ($NeighborCount = 0 && $LEDType = "on") do={
-    $LogPrintExit2 info $0 ("OSPF instance " . $InstanceVal->"name" . " has no neighbors, led off!") false;
-    /system/leds/set type=off [ find where leds=$LED ];
+    :local NeighborCount 0;
+    :foreach Area in=[ /routing/ospf/area/find where instance=($InstanceVal->"name") ] do={
+      :local AreaName [ /routing/ospf/area/get $Area name ];
+      :set NeighborCount ($NeighborCount + [ :len [ /routing/ospf/neighbor/find where area=$AreaName ] ]);
+    }
+
+    :if ($NeighborCount > 0 && $LEDType = "off") do={
+      $LogPrintExit2 info $ScriptName ("OSPF instance " . $InstanceVal->"name" . " has " . $NeighborCount . " neighbors, led on!") false;
+      /system/leds/set type=on [ find where leds=$LED ];
+    }
+    :if ($NeighborCount = 0 && $LEDType = "on") do={
+      $LogPrintExit2 info $ScriptName ("OSPF instance " . $InstanceVal->"name" . " has no neighbors, led off!") false;
+      /system/leds/set type=off [ find where leds=$LED ];
+    }
   }
 }
+
+$Main [ :jobname ];