tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling for Icinga Studio

Browse Source 
refs #10042
This commit is contained in:
Gunnar Beutner 2015-09-29 13:49:55 +02:00
parent 2363075802
commit 1bfa0a5ab1
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
icinga-studio/api.cpp
View File

@ -22,7 +22,9 @@
#include "base/json.hpp" #include "base/json.hpp"
#include "base/logger.hpp" #include "base/logger.hpp"
#include "base/exception.hpp" #include "base/exception.hpp"
#include "base/convert.hpp"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <wx/msgdlg.h>
using namespace icinga; using namespace icinga;
@ -35,11 +37,23 @@ ApiClient::ApiClient(const String& host, const String& port,
void ApiClient::GetTypes(const TypesCompletionCallback& callback) const void ApiClient::GetTypes(const TypesCompletionCallback& callback) const
{ {
boost::shared_ptr<HttpRequest> req = m_Connection->NewRequest(); Url::Ptr url = new Url("https://" + m_Connection->GetHost() + ":" + m_Connection->GetPort() + "/v1/types");
req->RequestMethod = "GET";
req->RequestUrl = new Url("https://" + m_Connection->GetHost() + ":" + m_Connection->GetPort() + "/v1/types"); try {
req->AddHeader("Authorization", "Basic " + Base64::Encode(m_User + ":" + m_Password)); boost::shared_ptr<HttpRequest> req = m_Connection->NewRequest();
m_Connection->SubmitRequest(req, boost::bind(TypesHttpCompletionCallback, _1, _2, callback)); req->RequestMethod = "GET";
req->RequestUrl = url;
req->AddHeader("Authorization", "Basic " + Base64::Encode(m_User + ":" + m_Password));
m_Connection->SubmitRequest(req, boost::bind(TypesHttpCompletionCallback, _1, _2, callback));
} catch (const std::exception& ex) {
callback(std::vector<ApiType::Ptr>());
std::string message = "HTTP request (" + url->Format() + ") failed.";
wxMessageBox(message);
Log(LogCritical, "ApiClient")
<< "HTTP request failed: " << DiagnosticInformation(ex);
}
} }
void ApiClient::TypesHttpCompletionCallback(HttpRequest& request, HttpResponse& response, void ApiClient::TypesHttpCompletionCallback(HttpRequest& request, HttpResponse& response,
@ -57,8 +71,9 @@ void ApiClient::TypesHttpCompletionCallback(HttpRequest& request, HttpResponse&
std::vector<ApiType::Ptr> types; std::vector<ApiType::Ptr> types;
if (response.StatusCode < 200 || response.StatusCode > 299) { if (response.StatusCode < 200 || response.StatusCode > 299) {
Log(LogCritical, "ApiClient") std::string message = "HTTP request failed; Code: " + Convert::ToString(response.StatusCode) + "; Body: " + body;
<< "Failed HTTP request; Code: " << response.StatusCode << "; Body: " << body;
wxMessageBox(message);
} else { } else {
try { try {
result = JsonDecode(body); result = JsonDecode(body);
@ -105,11 +120,23 @@ void ApiClient::GetObjects(const String& pluralType, const ObjectsCompletionCall
qp += "attrs[]=" + attr; qp += "attrs[]=" + attr;
} }
boost::shared_ptr<HttpRequest> req = m_Connection->NewRequest(); Url::Ptr pUrl = new Url(url + "?" + qp);
req->RequestMethod = "GET";
req->RequestUrl = new Url(url + "?" + qp); try {
req->AddHeader("Authorization", "Basic " + Base64::Encode(m_User + ":" + m_Password)); boost::shared_ptr<HttpRequest> req = m_Connection->NewRequest();
m_Connection->SubmitRequest(req, boost::bind(ObjectsHttpCompletionCallback, _1, _2, callback)); req->RequestMethod = "GET";
req->RequestUrl = pUrl;
req->AddHeader("Authorization", "Basic " + Base64::Encode(m_User + ":" + m_Password));
m_Connection->SubmitRequest(req, boost::bind(ObjectsHttpCompletionCallback, _1, _2, callback));
} catch (const std::exception& ex) {
callback(std::vector<ApiObject::Ptr>());
std::string message = "HTTP request (" + pUrl->Format() + ") failed.";
wxMessageBox(message);
Log(LogCritical, "ApiClient")
<< "HTTP request failed: " << DiagnosticInformation(ex);
}
} }
void ApiClient::ObjectsHttpCompletionCallback(HttpRequest& request, void ApiClient::ObjectsHttpCompletionCallback(HttpRequest& request,