Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:50:02 01.05.2026.

diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc
index ba4b45e0b93aafaa4330189041a59c40e6d1c21f..ed7715df03406032f9bd4028fe855ca083d1b9d5 100644 (file)
--- a/html/AM-FwAddrLists.rsc
+++ b/html/AM-FwAddrLists.rsc
@@ -22,8 +22,7 @@
   :global HumanReadableNum;
   :global IfThenElse;
   :global LogPrint;
-  :global LogPrintOnce;
-  :global LogPrintVerbose;
+
   :global NetMask4;
   :global NetMask6;
   :global ScriptLock;
@@ -48,8 +47,8 @@
   }
 
   :if ([ :len [ /log/find where topics=({"script"; "warning"}) \
-      message=("\$LogPrintOnce: The message is already in log, scripting subsystem may have crashed before!") ] ] > 0) do={
-    $LogPrintOnce warning $ScriptName ("Scripting subsystem may have crashed, possibly caused by us. Delaying!");
+      message=("\$LogPrint: The message is already in log, scripting subsystem may have crashed before!") ] ] > 0) do={
+    :log warning ($ScriptName . " Scripting subsystem may have crashed, possibly caused by us. Delaying!");
     :delay 5m;
   }
 
@@ -153,14 +152,14 @@
       :local Branch [ $GetBranch $Address ];
       :local TimeOut ($IPv4Addresses->$Branch->$Address);
       :if ([ :typeof $TimeOut ] = "time") do={
-        $LogPrintVerbose debug $ScriptName ("Renewing IPv4 address " . $Address . \
+        :log debug ($ScriptName . " Renewing IPv4 address " . $Address . \
             " in list '" . $FwListName . "' with " . $TimeOut . ".");
         /ip/firewall/address-list/set $Entry timeout=$TimeOut;
         :set ($IPv4Addresses->$Branch->$Address);
         :set CntRenew ($CntRenew + 1);
       } else={
         :if ($Failure = false) do={
-          $LogPrintVerbose debug $ScriptName ("Removing IPv4 address " . $Address . \
+          :log debug ($ScriptName . " Removing IPv4 address " . $Address . \
               " from list '" . $FwListName . ".");
           /ip/firewall/address-list/remove $Entry;
           :set CntRemove ($CntRemove + 1);
@@ -174,14 +173,14 @@
       :local Branch [ $GetBranch $Address ];
       :local TimeOut ($IPv6Addresses->$Branch->$Address);
       :if ([ :typeof $TimeOut ] = "time") do={
-        $LogPrintVerbose debug $ScriptName ("Renewing IPv6 address " . $Address . \
+        :log debug ($ScriptName . " Renewing IPv6 address " . $Address . \
             " in list '" . $FwListName . "' with " . $TimeOut . ".");
         /ipv6/firewall/address-list/set $Entry timeout=$TimeOut;
         :set ($IPv6Addresses->$Branch->$Address);
         :set CntRenew ($CntRenew + 1);
       } else={
         :if ($Failure = false) do={
-          $LogPrintVerbose debug $ScriptName ("Removing IPv6 address " . $Address . \
+          :log debug ($ScriptName . " Removing IPv6 address " . $Address . \
               " from list '" . $FwListName .".");
           /ipv6/firewall/address-list/remove $Entry;
           :set CntRemove ($CntRemove + 1);
@@ -190,9 +189,9 @@
     }
 
     :foreach BranchName,Branch in=$IPv4Addresses do={
-      $LogPrintVerbose debug $ScriptName ("Handling branch: " . $BranchName);
+      :log debug ($ScriptName . " Handling branch: " . $BranchName);
       :foreach Address,Timeout in=$Branch do={
-        $LogPrintVerbose debug $ScriptName ("Adding IPv4 address " . $Address . \
+        :log debug ($ScriptName . " Adding IPv4 address " . $Address . \
             " to list '" . $FwListName . "' with " . $Timeout . ".");
         :onerror Err {
           /ip/firewall/address-list/add list=$FwListName comment=$ListComment \
@@ -206,9 +205,9 @@
     }
 
     :foreach BranchName,Branch in=$IPv6Addresses do={
-      $LogPrintVerbose debug $ScriptName ("Handling branch: " . $BranchName);
+      :log debug ($ScriptName . " Handling branch: " . $BranchName);
       :foreach Address,Timeout in=$Branch do={
-        $LogPrintVerbose debug $ScriptName ("Adding IPv6 address " . $Address . \
+        :log debug ($ScriptName . " Adding IPv6 address " . $Address . \
             " to list '" . $FwListName . "' with " . $Timeout . ".");
         :onerror Err {
           /ipv6/firewall/address-list/add list=$FwListName comment=$ListComment \

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 3e560ed45a3946cb85c96be993ab1d4fa62b6cc9..635451e6a4cd6059e4faa04975bf55bd4d855d58 100644 (file)
--- a/html/AM-GlobalFunc.rsc
+++ b/html/AM-GlobalFunc.rsc
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/347/81bfb1ca";
+:global CommitId "main/348/e201dbb4";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:45:02 01.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:50:02 01.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;