From a01a90002c41740e7136f10c2c595df8c091e814 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Fri, 1 May 2026 06:05:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:05:03 01.05.2026. --- html/AM-FwAddrLists.rsc | 17 ++++++++--------- html/AM-GlobalFunc.rsc | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 770b24ff9..4a6cb5f97 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -71,7 +71,6 @@ :global EitherOr; :return [ :pick [ :convert transform=md5 to=hex [ :pick $1 0 [ $EitherOr [ :find $1 "/" ] [ :len $1 ] ] ] ] 0 2 ]; } - :put [$GetBranch]; :if ([ $ScriptLock $ScriptName ] = false) do={ :set ExitOK true; @@ -102,7 +101,7 @@ :if ([ :len ($List->"cert") ] > 0) do={ :set CheckCertificate true; :if ([ $CertificateAvailable ($List->"cert") "fetch" ] = false) do={ - $LogPrint warning $ScriptName ("Downloading required certificate (" . $FwListName . \ + :log warning ($ScriptName . " Downloading required certificate (" . $FwListName . \ " / " . $List->"url" . ") failed, trying anyway."); } } @@ -112,7 +111,7 @@ :set Data [ :tolf [ $FetchHuge $ScriptName ($List->"url") $CheckCertificate ] ]; :if ($Data = false) do={ :if ($I < 5) do={ - $LogPrint debug $ScriptName ("Failed downloading for list '" . $FwListName . \ + :log debug ($ScriptName . " Failed downloading for list '" . $FwListName . \ "', " . $I . ". try from: " . $List->"url"); :delay (($I * $I) . "s"); } @@ -123,10 +122,10 @@ :if ($Data = false) do={ :set Data ""; :set Failure true; - $LogPrint warning $ScriptName ("Failed downloading for list '" . $FwListName . \ + :log warning ($ScriptName . " Failed downloading for list '" . $FwListName . \ "' from: " . $List->"url"); } else={ - $LogPrint debug $ScriptName ("Downloaded " . [ $HumanReadableNum [ :len $Data ] 1024 ] . \ + :log debug ($ScriptName . " Downloaded " . [ $HumanReadableNum [ :len $Data ] 1024 ] . \ "B for list '" . $FwListName . "' from: " . $List->"url"); } @@ -174,7 +173,7 @@ :set ($IPv6Addresses->$Branch->$Address) $TimeOut; :error true; } - } on-error={ } + } on-error={:log error ($ScriptName . " Failed parsing address: " . $Line->0);} } } @@ -230,7 +229,7 @@ address=$Address timeout=$Timeout; :set CntAdd ($CntAdd + 1); } do={ - $LogPrint warning $ScriptName ("Failed to add IPv4 address " . $Address . \ + :log warning ($ScriptName . " Failed to add IPv4 address " . $Address . \ " to list '" . $FwListName . "': " . $Err); } } @@ -246,13 +245,13 @@ address=$Address timeout=$Timeout; :set CntAdd ($CntAdd + 1); } do={ - $LogPrint warning $ScriptName ("Failed to add IPv6 address " . $Address . \ + :log warning ($ScriptName . " Failed to add IPv6 address " . $Address . \ " to list '" . $FwListName . "': " . $Err); } } } - $LogPrint info $ScriptName ("list: " . $FwListName . \ + :log info ($ScriptName . " list: " . $FwListName . \ " (" . [ $HumanReadableNum ($CntAdd + $CntRenew) 1000 ] . ")" . \ " -- added: " . [ $HumanReadableNum $CntAdd 1000 ] . \ " - renewed: " . [ $HumanReadableNum $CntRenew 1000 ] . \ diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index ae09e6e2b..42df6d5fd 100644 --- 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/352/ae7bad3c"; +:global CommitId "main/353/35bb229e"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:50:02 01.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:05:03 01.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; -- 2.52.0