From 5767fceb393a51690920e4c2df02916409bab03f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 5 Jul 2022 16:31:49 +0200
Subject: netwatch-notify: quote the host/service name

---
 doc/netwatch-notify.d/notification-01-down.svg |  2 +-
 doc/netwatch-notify.d/notification-02-up.svg   |  2 +-
 netwatch-notify                                | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/netwatch-notify.d/notification-01-down.svg b/doc/netwatch-notify.d/notification-01-down.svg
index 40821b2..3a9133e 100644
--- a/doc/netwatch-notify.d/notification-01-down.svg
+++ b/doc/netwatch-notify.d/notification-01-down.svg
@@ -159,7 +159,7 @@
 </tspan><tspan
          x="180"
          y="40.85"
-         id="tspan2281">The host example.com (93.184.216.34) is down
+         id="tspan2281">The host 'example.com' (93.184.216.34) is down
 </tspan><tspan
          x="180"
          y="55.85"
diff --git a/doc/netwatch-notify.d/notification-02-up.svg b/doc/netwatch-notify.d/notification-02-up.svg
index 0454830..64e5e2d 100644
--- a/doc/netwatch-notify.d/notification-02-up.svg
+++ b/doc/netwatch-notify.d/notification-02-up.svg
@@ -159,7 +159,7 @@
 </tspan><tspan
          x="180"
          y="40.85"
-         id="tspan2246">The host example.com (93.184.216.34) is up
+         id="tspan2246">The host 'example.com' (93.184.216.34) is up
 </tspan><tspan
          x="180"
          y="55.85"
diff --git a/netwatch-notify b/netwatch-notify
index c21eb0d..445e329 100644
--- a/netwatch-notify
+++ b/netwatch-notify
@@ -33,15 +33,15 @@
     :do {
       [ :parse $Hook ];
     } on-error={
-      $LogPrintExit2 warning $0 ("The " . $State . "-hook for " . $Type . " " . $Name . " failed to run.") false;
+      $LogPrintExit2 warning $0 ("The " . $State . "-hook for " . $Type . " '" . $Name . "' failed to run.") false;
       :return ("The hook failed to run.");
     }
   } else={
-    $LogPrintExit2 warning $0 ("The " . $State . "-hook for " . $Type . " " . $Name . " failed syntax validation.") false;
+    $LogPrintExit2 warning $0 ("The " . $State . "-hook for " . $Type . " '" . $Name . "' failed syntax validation.") false;
     :return ("The hook failed syntax validation.");
   }
 
-  $LogPrintExit2 info $0 ("Ran hook on " . $Type . " " . $Name . " " . $State . ": " . $Hook) false;
+  $LogPrintExit2 info $0 ("Ran hook on " . $Type . " '" . $Name . "' " . $State . ": " . $Hook) false;
   :return ("Ran hook:\n" . $Hook);
 }
 
@@ -92,11 +92,11 @@ $ScriptLock $0;
     :if ($HostVal->"status" = "up") do={
       :local Count ($Metric->"count");
       :if ($Count > 0) do={
-        $LogPrintExit2 info $0 ("The " . $Type . " " . $Name . " (" . $HostVal->"host" . ") is up.") false;
+        $LogPrintExit2 info $0 ("The " . $Type . " '" . $Name . "' (" . $HostVal->"host" . ") is up.") false;
         :set ($Metric->"count") 0;
       }
       :if ($Metric->"notified" = true) do={
-        :local Message ("The " . $Type . " " . $Name . " (" . $HostVal->"host" . ") is up since " . $HostVal->"since" . ".\n" . \
+        :local Message ("The " . $Type . " '" . $Name . "' (" . $HostVal->"host" . ") is up since " . $HostVal->"since" . ".\n" . \
           "It was down for " . $Count . " checks since " . ($Metric->"since") . ".");
         :if ([ :typeof ($HostInfo->"up-hook") ] = "str") do={
           :set Message ($Message . "\n\n" . [ $NetwatchNotifyHook $Name $Type "up" ($HostInfo->"up-hook") ]);
@@ -127,14 +127,14 @@ $ScriptLock $0;
         }
       }
       $LogPrintExit2 [ $IfThenElse ($HostInfo->"no-down-notification" != true) info debug ] $0 \
-        ("The " . $Type . " " . $Name . " (" . $HostVal->"host" . ") is down for " . $Metric->"count" . " checks, " . \
+        ("The " . $Type . " '" . $Name . "' (" . $HostVal->"host" . ") is down for " . $Metric->"count" . " checks, " . \
         [ $IfThenElse ($ParentNotified = false) [ $IfThenElse ($Metric->"notified" = true) ("already notified.") \
         ($Count - $Metric->"count" . " to go.") ] ("parent " . $Type . " " . $Parent . " is down.") ]) false;
       :if ((($Count * 2) - ($Metric->"count" * 3)) / 2 = 0 && [ :typeof ($HostInfo->"pre-down-hook") ] = "str") do={
         $NetwatchNotifyHook $Name $Type "pre-down" ($HostInfo->"pre-down-hook");
       }
       :if ($ParentNotified = false && $Metric->"count" >= $Count && $Metric->"notified" != true) do={
-        :local Message ("The " . $Type . " " . $Name . " (" . $HostVal->"host" . ") is down since " . $HostVal->"since" . ".");
+        :local Message ("The " . $Type . " '" . $Name . "' (" . $HostVal->"host" . ") is down since " . $HostVal->"since" . ".");
         :if ([ :typeof ($HostInfo->"down-hook") ] = "str") do={
           :set Message ($Message . "\n\n" . [ $NetwatchNotifyHook $Name $Type "down" ($HostInfo->"down-hook") ]);
         }
-- 
cgit v1.2.3-70-g09d2