From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 18:30:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:30:03 04.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=97d1874f7d8642c697414c244f925bd8be9ae8a7;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:30:03 04.05.2026. --- diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 48972d60f..dc621ab56 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -53,32 +53,6 @@ :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; - -# :if ($tmpIndex->"status" = "finished") do={ -# :set arrLists [ :tolf ($tmpIndex->"Lists") ]; -# } -# } do={ -# :log warning ($ScriptName . " Failed downloading address-lists index from: '" . $Url . "' Error: " . $Err); -# :if ($Err != "Fetch failed with status 404") do={ -# :error false; -# } -# :set tmpIndex false; -# :set arrLists false; -# :error true; -# } - :for I from=1 to=5 do={ :if ($tmpIndex = false) do={ :set tmpIndex [ :tolf [ $FetchHugeFiles $ScriptName $Url $CheckCerts ] ]; @@ -174,10 +148,9 @@ :set ($IPv4Addresses->$Branch->$Address) $TimeOut; :set ($IPv6Addresses->$Branch->$Address) $TimeOut; } - } on-error={ - :log error ($ScriptName . " Failed parsing address: " . $Line->0); - } + } on-error={ } } + } :foreach Entry in=[ /ip/firewall/address-list/find where \ list=$ListName comment=$ListComment ] do={ @@ -185,14 +158,14 @@ :local Branch [ $GetBranch $Address ]; :local TimeOut ($IPv4Addresses->$Branch->$Address); :if ([ :typeof $TimeOut ] = "time") do={ - :log debug ($ScriptName . " Renewing IPv4 address " . $Address . \ + :log warning ($ScriptName . " Renewing IPv4 address " . $Address . \ " in list '" . $ListName . "' with " . $TimeOut . "."); /ip/firewall/address-list/set $Entry timeout=$TimeOut; :set ($IPv4Addresses->$Branch->$Address); :set CntRenew ($CntRenew + 1); } else={ :if ($Failure = false) do={ - :log debug ($ScriptName . " Removing IPv4 address " . $Address . \ + :log warning ($ScriptName . " Removing IPv4 address " . $Address . \ " from list '" . $ListName . "."); /ip/firewall/address-list/remove $Entry; :set CntRemove ($CntRemove + 1); @@ -206,14 +179,14 @@ :local Branch [ $GetBranch $Address ]; :local TimeOut ($IPv6Addresses->$Branch->$Address); :if ([ :typeof $TimeOut ] = "time") do={ - :log debug ($ScriptName . " Renewing IPv6 address " . $Address . \ + :log warning ($ScriptName . " Renewing IPv6 address " . $Address . \ " in list '" . $ListName . "' with " . $TimeOut . "."); /ipv6/firewall/address-list/set $Entry timeout=$TimeOut; :set ($IPv6Addresses->$Branch->$Address); :set CntRenew ($CntRenew + 1); } else={ :if ($Failure = false) do={ - :log debug ($ScriptName . " Removing IPv6 address " . $Address . \ + :log warning ($ScriptName . " Removing IPv6 address " . $Address . \ " from list '" . $ListName . "."); /ipv6/firewall/address-list/remove $Entry; :set CntRemove ($CntRemove + 1); @@ -222,9 +195,9 @@ } :foreach BranchName,Branch in=$IPv4Addresses do={ - :log debug ($ScriptName . " Handling branch: " . $BranchName); + :log warning ($ScriptName . " Handling branch: " . $BranchName); :foreach Address,Timeout in=$Branch do={ - :log debug ($ScriptName . " Adding IPv4 address " . $Address . \ + :log warning ($ScriptName . " Adding IPv4 address " . $Address . \ " to list '" . $ListName . "' with " . $Timeout . "."); :onerror Err { /ip/firewall/address-list/add list=$ListName comment=$ListComment \ @@ -238,9 +211,9 @@ } :foreach BranchName,Branch in=$IPv6Addresses do={ - :log debug ($ScriptName . " Handling branch: " . $BranchName); + :log warning ($ScriptName . " Handling branch: " . $BranchName); :foreach Address,Timeout in=$Branch do={ - :log debug ($ScriptName . " Adding IPv6 address " . $Address . \ + :log warning ($ScriptName . " Adding IPv6 address " . $Address . \ " to list '" . $ListName . "' with " . $Timeout . "."); :onerror Err { /ipv6/firewall/address-list/add list=$ListName comment=$ListComment \ diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 08582c8da..c3ca3bece 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/597/e140e1c7"; +:global CommitId "main/598/1c6ca643"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:15:02 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:30:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140;