Merge branch 'no-error-on-exit' into nextrouteros-7.15beta4-1

1 files changed, 9 insertions, 4 deletions

diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 45c12d4..2468d35 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -20,11 +20,14 @@
   :global ParseKeyValueStore;
   :global ScriptLock;
 
-  $ScriptLock $ScriptName;
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :return false;
+  }
 
   :local SettleTime (5m30s - [ /system/resource/get uptime ]);
   :if ($SettleTime > 0s) do={
-    $LogPrintExit2 info $ScriptName ("System just booted, giving netwatch " . $SettleTime . " to settle.") true;
+    $LogPrintExit2 info $ScriptName ("System just booted, giving netwatch " . $SettleTime . " to settle.") false;
+    :return true;
   }
 
   :local DnsServers ({});
@@ -80,7 +83,8 @@
       }
 
       :if ($DohCurrent = $HostInfo->"doh-url") do={
-        $LogPrintExit2 debug $ScriptName ("Current DoH server is still up: " . $DohCurrent) true;
+        $LogPrintExit2 debug $ScriptName ("Current DoH server is still up: " . $DohCurrent) false;
+        :return true;
       }
 
       :set ($DohServers->[ :len $DohServers ]) $HostInfo;
@@ -116,7 +120,8 @@
       :if ([ :typeof [ :find $Data "doh-check-OK" ] ] = "num") do={
         /ip/dns/set use-doh-server=($DohServer->"doh-url") verify-doh-cert=yes;
         /ip/dns/cache/flush;
-        $LogPrintExit2 info $ScriptName ("Setting DoH server: " . ($DohServer->"doh-url")) true;
+        $LogPrintExit2 info $ScriptName ("Setting DoH server: " . ($DohServer->"doh-url")) false;
+        :return true;
       } else={
         $LogPrintExit2 warning $ScriptName ("Received unexpected response from DoH server: " . \
           ($DohServer->"doh-url")) false;