From cd0398acf9ccfcd488f0b8e9044f9789368937a1 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 23 Jun 2021 10:54:24 +0200 Subject: [PATCH] ipv6-update: use $LogPrintExit2 This will never print to terminal, nevertheless we want proper log with script name in prefix. --- ipv6-update | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ipv6-update b/ipv6-update index 45efccd..260b03b 100644 --- a/ipv6-update +++ b/ipv6-update @@ -22,13 +22,13 @@ :local Pool [ / ipv6 pool get [ find where prefix=$PdPrefix ] name ]; :if ([ :len [ / ipv6 firewall address-list find where comment=("ipv6-pool-" . $Pool) ] ] = 0) do={ / ipv6 firewall address-list add list=("ipv6-pool-" . $Pool) address=:: comment=("ipv6-pool-" . $Pool); - :log warning ("Added ipv6 address list entry for ipv6-pool-" . $Pool . "."); + $LogPrintExit2 warning $0 ("Added ipv6 address list entry for ipv6-pool-" . $Pool) false; } :local AddrList [ / ipv6 firewall address-list find where comment=("ipv6-pool-" . $Pool) ]; :local OldPrefix [ / ipv6 firewall address-list get ($AddrList->0) address ]; :if ($OldPrefix != $PdPrefix) do={ - :log info ("Updating IPv6 address list with new IPv6 prefix " . $PdPrefix); + $LogPrintExit2 info $0 ("Updating IPv6 address list with new IPv6 prefix " . $PdPrefix) false; / ipv6 firewall address-list set address=$PdPrefix $AddrList; # give the interfaces a moment to receive their addresses @@ -41,7 +41,8 @@ :local Address [ / ipv6 address find where from-pool=$Pool interface=($Comment->"interface") ]; :if ([ :len $Address ] = 1) do={ :set Address [ / ipv6 address get $Address address ]; - :log info ("Updating IPv6 address list with new IPv6 prefix " . $Address . " from interface " . ($Comment->"interface")); + $LogPrintExit2 info $0 ("Updating IPv6 address list with new IPv6 prefix " . $Address . \ + " from interface " . ($Comment->"interface")) false; / ipv6 firewall address-list set address=$Address $ListEntry; } } @@ -54,7 +55,8 @@ :set Prefix ([ :toip6 [ :pick $Prefix 0 [ :find $Prefix "/64" ] ] ] & ffff:ffff:ffff:ffff::); :local Address ($Prefix | ([ :toip6 ($RecordVal->"address") ] & ::ffff:ffff:ffff:ffff)); - :log info ("Updating DNS record for " . ($RecordVal->"name") . ($RecordVal->"regexp") . " to " . $Address); + $LogPrintExit2 info $0 ("Updating DNS record for " . ($RecordVal->"name") . \ + ($RecordVal->"regexp") . " to " . $Address) false; / ip dns static set address=$Address $Record; } }