From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 17:25:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 20:25:03 04.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=09d4bb09150aea658426a5eff3b250ebde2f7734;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 20:25:03 04.05.2026. --- diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 3512bf3c5..4f2fa911a 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -53,18 +53,18 @@ :local Url ($ListsUrl . $ListsIndex); :local tmpIndex false; - :do { - :onerror Err { - :log info ($0 " Fetching script '" . $ScriptName . "' from url: " . $Url); - :set tmpIndex [ /tool/fetch check-certificate=yes-without-crl \ - http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) $Url dst-path=$tmpIndex ]; - } do={ - :if (!($Err ~ "[Ss]tatus 404")) do={ - :log warning ($ScriptName . " Failed downloading address-lists index from: '" . $Url . "' Error: " . $Err); - } - :error false; - } - $WaitForFile $tmpIndex; +# :do { +# :onerror Err { +# :log info ($0 " Fetching script '" . $ScriptName . "' from url: " . $Url); +# :set tmpIndex [ /tool/fetch check-certificate=yes-without-crl \ +# http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) $Url dst-path=$tmpIndex ]; +# } do={ +# :if (!($Err ~ "[Ss]tatus 404")) do={ +# :log warning ($ScriptName . " Failed downloading address-lists index from: '" . $Url . "' Error: " . $Err); +# } +# :error false; +# } +# $WaitForFile $tmpIndex; # :if ($tmpIndex->"status" = "finished") do={ # :set arrLists [ :tolf ($tmpIndex->"Lists") ]; @@ -79,20 +79,19 @@ # :error true; # } -# :for I from=1 to=5 do={ -# :if ($tmpIndex = false) do={ -# :set tmpIndex [ :tolf [ $FetchHugeFiles $ScriptName $FwAddrListsUrl $Index $CheckCerts ] ]; -# :if ($tmpIndex = false && $I < 5) do={ -# :log warning ($ScriptName . " Failed downloading address-list index, " . $I . ". try from: " . $FwAddrListsUrl . $Index); -# :delay (($I * $I) . "s"); -# } -# } -# } + :for I from=1 to=5 do={ + :if ($tmpIndex = false) do={ + :set tmpIndex [ :tolf [ $FetchHugeFiles $ScriptName $Url $CheckCerts ] ]; + :if ($tmpIndex = false && $I < 5) do={ + :log warning ($ScriptName . " Failed downloading address-list index, " . $I . ". try from: " . $FwAddrListsUrl . $Index); + :delay (($I * $I) . "s"); + } + } + } :if ($tmpIndex = false) do={ - :log warning ($ScriptName . " Failed downloading address-list index from: " . $FwAddrListsUrl . $Index); + :log warning ($ScriptName . " Failed downloading address-list index from: " . $Url); :set tmpIndex ""; } - } :foreach List in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={ :set List ($List->0); diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 3f9ea6461..6dba42e26 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/592/9ef54f8b"; +:global CommitId "main/593/61326945"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 20:20:03 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 20:25:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140;