From f681a0d3a73f35b21b9c21ad4b5623522adf1ca9 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 18:45:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 18:45:03 04.05.2026. --- html/AM-FwAddrLists.rsc | 31 ++++++++++++++++--------------- html/AM-GlobalFunc.rsc | 4 ++-- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 532c92a14..825c9e734 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -84,18 +84,19 @@ # :set tmpIndex ""; # } - :foreach FwList in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={ - :set FwList ($FwList->0); - :local FwListName; - :local Delim [ $FindDelim $FwList ]; - :if ($Delim = 0) do={ :set FwList ""; }; - :log warning ($ScriptName . " Parsing address-list index entry: " . $FwList); - :if ([ :len $FwList ] = 0) do={ - :log error ($ScriptName . " Failed parsing address-list index entry: " . $FwList); + :foreach List in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={ + :set List ($List->0); + :local ListName; + :local Delim [ $FindDelim $List ]; + :if ($Delim = 0) do={ :set List ""; }; + :log warning ($ScriptName . " Parsing address-list index entry: " . $List); + :if ([ :len $List ] = 0) do={ + :log error ($ScriptName . " Failed parsing address-list index entry: " . $List); } else={ - :set FwListName [ :pick $FwList 0 $Delim ]; + :set ListName [ :pick $List 0 $Delim ]; } - :log warning ($ScriptName . " Parsing address-list index entry: " . $FwListName . " - Ok."); + :log warning ($ScriptName . " Parsing address-list index entry: " . $ListName . " - Ok."); + :local Url ($ListsUrl . $ListName); :local CntAdd 0; :local CntRenew 0; :local CntRemove 0; @@ -103,13 +104,13 @@ :local IPv6Addresses ({}); :local Failure false; :local Data false; - :local TimeOut $FwAddrListTimeOut; + :local TimeOut $AddrListTimeOut; :for I from=1 to=5 do={ :if ($Data = false) do={ - :set Data [ :tolf [ $FetchHugeFiles $ScriptName $FwAddrListsUrl $FwListName $CheckCerts ] ]; + :set Data [ :tolf [ $FetchHugeFiles $ScriptName $Url $CheckCerts ] ]; :if ($Data = false && $I < 5) do={ - :log warning ($ScriptName . " Failed downloading for list '" . $FwListName . "', " . $I . ". try from: " . $FwAddrListsUrl . $FwListName); + :log warning ($ScriptName . " Failed downloading for list '" . $ListName . "', " . $I . ". try from: " . $Url); :delay (($I * $I) . "s"); } } @@ -118,9 +119,9 @@ :if ($Data = false) do={ :set Data ""; :set Failure true; - :log warning ($ScriptName . " Failed downloading for list '" . $FwListName . "' from: " . $FwAddrListsUrl . $FwListName); + :log warning ($ScriptName . " Failed downloading for list '" . $ListName . "' from: " . $Url); } else={ - :log debug ($ScriptName . " Downloaded " . [ $HumanReadableNum [ :len $Data ] 1024 ] . "B for list '" . $FwListName . "' from: " . $FwAddrListsUrl . $FwListName); + :log debug ($ScriptName . " Downloaded " . [ $HumanReadableNum [ :len $Data ] 1024 ] . "B for list '" . $ListName . "' from: " . $Url); } :foreach Line in=[ :deserialize $Data delimiter="\n" from=dsv options=dsv.plain ] do={ diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 59e903114..1b2580ce9 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/581/3de1f6c0"; +:global CommitId "main/582/d5d0a707"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 18:35:02 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 18:45:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; -- 2.52.0