mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-16 13:04:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

collect-wireless-mac: drop main function, use :do with on-error

Browse source
This commit is contained in:
Christian Hesse 2024-03-06 15:28:55 +01:00
parent 7110b29cba
commit 4ada2e7678
4 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
collect-wireless-mac.capsman.rsc
View file

@ -14,8 +14,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global Identity; :global Identity;
@ -29,7 +29,7 @@
:global SymbolForNotification; :global SymbolForNotification;
:if ([ $ScriptLock $ScriptName 10 ] = false) do={ :if ([ $ScriptLock $ScriptName 10 ] = false) do={
:return false; :error false;
} }
:if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={ :if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
@ -93,6 +93,4 @@
$LogPrintExit2 debug $ScriptName ("No mac address available... Ignoring.") false; $LogPrintExit2 debug $ScriptName ("No mac address available... Ignoring.") false;
} }
} }
} } on-error={ }
$Main [ :jobname ];

10
collect-wireless-mac.local.rsc
View file

@ -14,8 +14,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global Identity; :global Identity;
@ -29,7 +29,7 @@
:global SymbolForNotification; :global SymbolForNotification;
:if ([ $ScriptLock $ScriptName 10 ] = false) do={ :if ([ $ScriptLock $ScriptName 10 ] = false) do={
:return false; :error false;
} }
:if ([ :len [ /interface/wireless/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={ :if ([ :len [ /interface/wireless/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
@ -94,6 +94,4 @@
$LogPrintExit2 debug $ScriptName ("No mac address available... Ignoring.") false; $LogPrintExit2 debug $ScriptName ("No mac address available... Ignoring.") false;
} }
} }
} } on-error={ }
$Main [ :jobname ];

10
collect-wireless-mac.template.rsc
View file

@ -15,8 +15,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global Identity; :global Identity;
@ -30,7 +30,7 @@
:global SymbolForNotification; :global SymbolForNotification;
:if ([ $ScriptLock $ScriptName 10 ] = false) do={ :if ([ $ScriptLock $ScriptName 10 ] = false) do={
:return false; :error false;
} }
:if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={ :if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
@ -111,6 +111,4 @@
$LogPrintExit2 debug $ScriptName ("No mac address available... Ignoring.") false; $LogPrintExit2 debug $ScriptName ("No mac address available... Ignoring.") false;
} }
} }
} } on-error={ }
$Main [ :jobname ];

10
collect-wireless-mac.wifi.rsc
View file

@ -14,8 +14,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global Identity; :global Identity;
@ -29,7 +29,7 @@
:global SymbolForNotification; :global SymbolForNotification;
:if ([ $ScriptLock $ScriptName 10 ] = false) do={ :if ([ $ScriptLock $ScriptName 10 ] = false) do={
:return false; :error false;
} }
:if ([ :len [ /interface/wifi/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={ :if ([ :len [ /interface/wifi/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
@ -93,6 +93,4 @@
$LogPrintExit2 debug $ScriptName ("No mac address available... Ignoring.") false; $LogPrintExit2 debug $ScriptName ("No mac address available... Ignoring.") false;
} }
} }
} } on-error={ }
$Main [ :jobname ];