From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Fri, 15 May 2026 10:05:04 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 13:05:03 15.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=8ae9ca2023bbe046a40750d0738b09fb9ad1886c;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 13:05:03 15.05.2026. --- diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 90e0c8780..10305bcd0 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/651/c95dd067"; +:global CommitId "main/652/6a20e295"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:40:03 15.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 13:05:03 15.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; diff --git a/html/AM-RKN-dnsLookup.rsc b/html/AM-RKN-dnsLookup.rsc index 62d976fbb..9c3ffe501 100644 --- a/html/AM-RKN-dnsLookup.rsc +++ b/html/AM-RKN-dnsLookup.rsc @@ -60,11 +60,15 @@ while (!$dnsLookupReady) do={ :nothing; } :foreach dnsRecord in=[/ip dns cache all find where (name=$aItem)] do={ :if ([/ip dns cache all get $dnsRecord type]="A") do={ :local newAddress [/ip dns cache all get $dnsRecord data]; - :do { - /ip firewall address-list add list=$ListRKN address=$newAddress comment=$aItem; - } on-error={ +# :do { + :if ([/ip firewall address-list add list=$ListRKN address=$newAddress comment=$aItem]) do={ + :log warning "Successfully adding ip to list A record: $dnsRecord, address: $newAddress domain: $aItem"; + } else={ :log error "error when adding ip to list A record: $dnsRecord, address: $newAddress domain: $aItem"; - } + } +# } on-error={ +# :log error "error when adding ip to list A record: $dnsRecord, address: $newAddress domain: $aItem"; +# } } :if ([/ip dns cache all get $dnsRecord type]="CNAME") do={ :local cname; @@ -80,6 +84,7 @@ while (!$dnsLookupReady) do={ :nothing; } :do { :set cnameAddress [/ip dns cache all get $aRecord data]; /ip firewall address-list add list=$ListRKN address=$cnameAddress comment=$aItem; + :log warning "Succesfully adding ip to list CNAME record: $cname, A record: $aRecord, address: $newAddress, from domain: $aItem."; # /ip firewall raw add action=add-dst-to-address-list address-list=$ListRKN address-list-timeout=none-dynamic chain=prerouting comment=$aItem content=$aItem; } on-error={ :log error "error when adding ip to list CNAME record: $cname, A record: $aRecord, address: $newAddress, from domain: $aItem.";