tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6400 from Icinga/feature/nscp-api-debug-logger 

Enhance debug logging for check_nscp_api
This commit is contained in:
Michael Friedrich 2018-06-21 15:28:24 +02:00 committed by GitHub
parent cc294e14d2 d9a55ac064
commit d2a6b260bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/check_nscp_api.cpp
View File

@ -25,6 +25,7 @@
#include "base/application.hpp" #include "base/application.hpp"
#include "base/json.hpp" #include "base/json.hpp"
#include "base/string.hpp" #include "base/string.hpp"
#include "base/logger.hpp"
#include "base/exception.hpp" #include "base/exception.hpp"
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/split.hpp>
@ -93,8 +94,10 @@ static Dictionary::Ptr QueryEndpoint(const String& host, const String& port, con
req->RequestUrl->SetArrayFormatUseBrackets(false); req->RequestUrl->SetArrayFormatUseBrackets(false);
req->AddHeader("password", password); req->AddHeader("password", password);
if (l_Debug) if (l_Debug) {
std::cout << "Sending request to 'https://" << host << ":" << port << req->RequestUrl->Format(false, false) << "'\n"; std::cout << "Sending request to 'https://" << host << ":" << port << req->RequestUrl->Format(false, false) << "'\n"
<< "Headers: " << JsonEncode(req->Headers) << "\n";
}
// Submits the request. The 'ResultHttpCompletionCallback' is called once the HttpRequest receives an answer, // Submits the request. The 'ResultHttpCompletionCallback' is called once the HttpRequest receives an answer,
// which then sets 'ready' to true // which then sets 'ready' to true
@ -223,7 +226,7 @@ static int FormatOutput(const Dictionary::Ptr& result)
state == "UNKNOWN" ? 3 : 4; state == "UNKNOWN" ? 3 : 4;
if (creturn == 4) { if (creturn == 4) {
std::cout << "check_nscp UNKNOWN Answer format error: 'result' was not a known state.\n"; std::cout << "check_nscp_api UNKNOWN Answer format error: 'result' was not a known state.\n";
return 3; return 3;
} }
@ -282,6 +285,12 @@ int main(int argc, char **argv)
l_Debug = vm.count("debug") > 0; l_Debug = vm.count("debug") > 0;
// Initialize logger
if (l_Debug)
Logger::SetConsoleLogSeverity(LogDebug);
else
Logger::SetConsoleLogSeverity(LogWarning);
// Create the URL string and escape certain characters since Url() follows RFC 3986 // Create the URL string and escape certain characters since Url() follows RFC 3986
String endpoint = "/query/" + vm["query"].as<std::string>(); String endpoint = "/query/" + vm["query"].as<std::string>();
if (!vm.count("arguments")) if (!vm.count("arguments"))