netwatch-notify: cache the result

eworm-de · mgisbers · eworm-de · commit 6822e7156468 · 2022-10-21T15:00:42.000+02:00
If this script runs from terminal this will not change... 😜
So cache the result.

Co-authored-by: Michael Gisbers &lt;michael@gisbers.de&gt;
diff --git a/netwatch-notify b/netwatch-notify
@@ -52,6 +52,8 @@
 
 $ScriptLock $0;
 
+:local ScriptFromTerminalCached [ $ScriptFromTerminal $0 ];
+
 :if ([ /system/resource/get uptime ] < 5m) do={
   $LogPrintExit2 info $0 ("System just booted, giving netwatch some time to settle.") true;
 }
@@ -145,7 +147,7 @@ $ScriptLock $0;
         }
       }
       :if ($Metric->"notified" = false || $Metric->"count-down" % 120 = 0 || \
-           [ $ScriptFromTerminal $0 ] = true) do={
+           $ScriptFromTerminalCached = true) do={
         $LogPrintExit2 [ $IfThenElse ($HostInfo->"no-down-notification" != true) info debug ] $0 \
             ("The " . $Type . " '" . $Name . "' (" . $HostDetails . ") is down for " . \
             $Metric->"count-down" . " checks, " . [ $IfThenElse ($ParentNotified = false) [ $IfThenElse \

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@`
`52`	`52`
`53`	`53`	`$ScriptLock $0;`
`54`	`54`
	`55`	`+:local ScriptFromTerminalCached [ $ScriptFromTerminal $0 ];`
	`56`	`+`
`55`	`57`	`:if ([ /system/resource/get uptime ] < 5m) do={`
`56`	`58`	`$LogPrintExit2 info $0 ("System just booted, giving netwatch some time to settle.") true;`
`57`	`59`	`}`
`@@ -145,7 +147,7 @@ $ScriptLock $0;`
`145`	`147`	`}`
`146`	`148`	`}`
`147`	`149`	`:if ($Metric->"notified" = false \|\| $Metric->"count-down" % 120 = 0 \|\| \`
`148`		`- [ $ScriptFromTerminal $0 ] = true) do={`
	`150`	`+ $ScriptFromTerminalCached = true) do={`
`149`	`151`	`$LogPrintExit2 [ $IfThenElse ($HostInfo->"no-down-notification" != true) info debug ] $0 \`
`150`	`152`	`("The " . $Type . " '" . $Name . "' (" . $HostDetails . ") is down for " . \`
`151`	`153`	`$Metric->"count-down" . " checks, " . [ $IfThenElse ($ParentNotified = false) [ $IfThenElse \`