From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 30 Aug 2013 15:02:21 +0000 (+0200)
Subject: Fix HOSTSTATE macro.
X-Git-Tag: v0.0.3~633
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6aa1682878ccdc73a5e5879ec8cf1ee0fb308052;p=icinga2

Fix HOSTSTATE macro.
---

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 2376e64c5..c9b4e7ea1 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -611,7 +611,22 @@ bool Host::ResolveMacro(const String& macro, const Dictionary::Ptr&, String *res
 		bool reachable = IsReachable();
 
 		if (macro == "HOSTSTATE") {
-			*result = Convert::ToString(CalculateState(state, reachable));
+			HostState hstate = CalculateState(state, reachable);
+
+			switch (hstate) {
+				case HostUnreachable:
+					*result = "UNREACHABLE";
+					break;
+				case HostUp:
+					*result = "UP";
+					break;
+				case HostDown:
+					*result = "DOWN";
+					break;
+				default:
+					ASSERT(0);
+			}
+
 			return true;
 		} else if (macro == "HOSTSTATEID") {
 			*result = Convert::ToString(state);