From: Jean Flach <jean-marcel.flach@icinga.com>
Date: Wed, 13 Dec 2017 16:48:16 +0000 (+0100)
Subject: Fix check_service returning Warning instead of Critical
X-Git-Tag: v2.9.0~296^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fpull%2F5851%2Fhead;p=icinga2

Fix check_service returning Warning instead of Critical

fixes #5849
---

diff --git a/plugins/check_service.cpp b/plugins/check_service.cpp
index f5f0f463b..fa730e297 100644
--- a/plugins/check_service.cpp
+++ b/plugins/check_service.cpp
@@ -126,9 +126,7 @@ INT parseArguments(INT ac, WCHAR **av, po::variables_map& vm, printInfoStruct& p
 
 	printInfo.service = vm["service"].as<std::wstring>();
 
-	if (vm.count("warn")) {
-		printInfo.warn = true;
-	}
+	printInfo.warn = vm.count("warn");
 
 	if (vm.count("D"))
 		debug = TRUE;
@@ -157,10 +155,10 @@ INT printOutput(CONST printInfoStruct& printInfo)
 		std::wcout << L"SERVICE \"" << printInfo.service << "\" OK RUNNING | service=4;;;1;7" << '\n';
 		break;
 	case WARNING:
-		std::wcout << L"SERVICE \"" << printInfo.service << "\"WARNING NOT RUNNING | service=" << printInfo.ServiceState << ";;;1;7" << '\n';
+		std::wcout << L"SERVICE \"" << printInfo.service << "\" WARNING NOT RUNNING | service=" << printInfo.ServiceState << ";;;1;7" << '\n';
 		break;
 	case CRITICAL:
-		std::wcout << L"SERVICE \"" << printInfo.service << "\"CRITICAL NOT RUNNING | service=" << printInfo.ServiceState << ";;;1;7" << '\n';
+		std::wcout << L"SERVICE \"" << printInfo.service << "\" CRITICAL NOT RUNNING | service=" << printInfo.ServiceState << ";;;1;7" << '\n';
 		break;
 	}