From f46db918453dcb8878b9a0de6e122fb0ea2224d9 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 22 Feb 2021 15:14:10 +0100 Subject: global: give script or function name in log messages --- bridge-port-to-default | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'bridge-port-to-default') diff --git a/bridge-port-to-default b/bridge-port-to-default index 60e3112..b8503df 100644 --- a/bridge-port-to-default +++ b/bridge-port-to-default @@ -6,13 +6,14 @@ # reset bridge ports to default bridge # https://git.eworm.de/cgit/routeros-scripts/about/doc/bridge-port.md +:local 0 "bridge-port-to-default"; :global GlobalFunctionsReady; :while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :global BridgePortTo; :global IfThenElse; -:global LogPrintExit; +:global LogPrintExit2; :global ParseKeyValueStore; :foreach BridgePort in=[ / interface bridge port find where !(comment=[]) ] do={ @@ -23,19 +24,19 @@ :if ($BridgeDefault = "dhcp-client") do={ :if ([ :len $DHCPClient ] != 1) do={ - $LogPrintExit warning ([ $IfThenElse ([ :len $DHCPClient ] = 0) "Missing" "Duplicate" ] . \ + $LogPrintExit2 warning $0 ([ $IfThenElse ([ :len $DHCPClient ] = 0) "Missing" "Duplicate" ] . \ " dhcp client configuration for interface " . $BridgePortVal->"interface" . "!") true; } :local DHCPClientDisabled [ / ip dhcp-client get $DHCPClient disabled ]; :if ($BridgePortVal->"disabled" = false || $DHCPClientDisabled = true) do={ - $LogPrintExit info ("Disabling bridge port for interface " . $BridgePortVal->"interface" . ", enabling dhcp client.") false; + $LogPrintExit2 info $0 ("Disabling bridge port for interface " . $BridgePortVal->"interface" . ", enabling dhcp client.") false; / interface bridge port disable $BridgePort; / ip dhcp-client enable $DHCPClient; } } else={ :if ($BridgePortVal->"disabled" = true || $BridgeDefault != $BridgePortVal->"bridge") do={ - $LogPrintExit info ("Enabling bridge port for interface " . $BridgePortVal->"interface" . ", changing to " . $BridgePortTo . \ + $LogPrintExit2 info $0 ("Enabling bridge port for interface " . $BridgePortVal->"interface" . ", changing to " . $BridgePortTo . \ " bridge " . $BridgeDefault . ", disabling dhcp client.") false; :if ([ :len $DHCPClient ] = 1) do={ / ip dhcp-client disable $DHCPClient; @@ -43,7 +44,7 @@ } / interface bridge port set disabled=no bridge=$BridgeDefault $BridgePort; } else={ - $LogPrintExit debug ("Interface " . $BridgePortVal->"interface" . " already connected to " . $BridgePortTo . \ + $LogPrintExit2 debug $0 ("Interface " . $BridgePortVal->"interface" . " already connected to " . $BridgePortTo . \ " bridge " . $BridgeDefault . ".") false; } } -- cgit v1.2.3-54-g00ecf