ipv6-update: use $LogPrintExit2

This will never print to terminal, nevertheless we want proper
log with script name in prefix.
This commit is contained in:
Christian Hesse 2021-06-23 10:54:24 +02:00
parent 1a404195d5
commit cd0398acf9

View file

@ -22,13 +22,13 @@
:local Pool [ / ipv6 pool get [ find where prefix=$PdPrefix ] name ]; :local Pool [ / ipv6 pool get [ find where prefix=$PdPrefix ] name ];
:if ([ :len [ / ipv6 firewall address-list find where comment=("ipv6-pool-" . $Pool) ] ] = 0) do={ :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); / 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 AddrList [ / ipv6 firewall address-list find where comment=("ipv6-pool-" . $Pool) ];
:local OldPrefix [ / ipv6 firewall address-list get ($AddrList->0) address ]; :local OldPrefix [ / ipv6 firewall address-list get ($AddrList->0) address ];
:if ($OldPrefix != $PdPrefix) do={ :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; / ipv6 firewall address-list set address=$PdPrefix $AddrList;
# give the interfaces a moment to receive their addresses # 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") ]; :local Address [ / ipv6 address find where from-pool=$Pool interface=($Comment->"interface") ];
:if ([ :len $Address ] = 1) do={ :if ([ :len $Address ] = 1) do={
:set Address [ / ipv6 address get $Address address ]; :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; / 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::); :set Prefix ([ :toip6 [ :pick $Prefix 0 [ :find $Prefix "/64" ] ] ] & ffff:ffff:ffff:ffff::);
:local Address ($Prefix | ([ :toip6 ($RecordVal->"address") ] & ::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; / ip dns static set address=$Address $Record;
} }
} }