1 files changed, 14 insertions, 6 deletions
diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 09d471d..467d636 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -1,16 +1,18 @@
 #!rsc by RouterOS
 # RouterOS script: netwatch-dns
-# Copyright (c) 2022-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2022-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.14
+# requires RouterOS, version=7.16
+# requires device-mode, fetch
 #
 # monitor and manage dns/doh with netwatch
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/netwatch-dns.md
+# https://rsc.eworm.de/doc/netwatch-dns.md
 
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
+:local ExitOK false;
 :do {
   :local ScriptName [ :jobname ];
 
@@ -24,12 +26,14 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
     :error false;
   }
 
   :local SettleTime (5m30s - [ /system/resource/get uptime ]);
   :if ($SettleTime > 0s) do={
     $LogPrint info $ScriptName ("System just booted, giving netwatch " . $SettleTime . " to settle.");
+    :set ExitOK true;
     :error true;
   }
 
@@ -80,7 +84,7 @@
     :local HostVal [ /tool/netwatch/get $Host ];
     :local HostInfo [ $ParseKeyValueStore ($HostVal->"comment") ];
     :local HostName [ /ip/dns/static/find where name address=($HostVal->"host") \
-        (!type or type="A" or type="AAAA") !disabled !dynamic ];
+        (type="A" or type="AAAA") !disabled !dynamic ];
     :if ([ :len $HostName ] > 0) do={
       :set HostName [ /ip/dns/static/get ($HostName->0) name ];
     }
@@ -92,6 +96,7 @@
 
       :if ($DohCurrent = $HostInfo->"doh-url") do={
         $LogPrint debug $ScriptName ("Current DoH server is still up: " . $DohCurrent);
+        :set ExitOK true;
         :error true;
       }
 
@@ -132,6 +137,7 @@
         }
         /ip/dns/cache/flush;
         $LogPrint info $ScriptName ("Setting DoH server: " . ($DohServer->"doh-url"));
+        :set ExitOK true;
         :error true;
       } else={
         $LogPrint warning $ScriptName ("Received unexpected response from DoH server: " . \
@@ -139,4 +145,6 @@
       }
     }
   }
-} on-error={ }
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
+}