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

More refactoring of config packages errors

This commit is contained in:
Michael Friedrich 2018-04-06 09:53:54 +02:00
parent de2d18d85d
commit 36cdf8a0d2
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/remote/configpackageshandler.cpp
View File

@ -54,7 +54,7 @@ void ConfigPackagesHandler::HandleGet(const ApiUser::Ptr& user, HttpRequest& req
packages = ConfigPackageUtility::GetPackages(); packages = ConfigPackageUtility::GetPackages();
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
HttpUtility::SendJsonError(response, params, 500, "Could not retrieve packages.", HttpUtility::SendJsonError(response, params, 500, "Could not retrieve packages.",
DiagnosticInformation(ex, false)); DiagnosticInformation(ex));
return; return;
} }
@ -98,12 +98,13 @@ void ConfigPackagesHandler::HandlePost(const ApiUser::Ptr& user, HttpRequest& re
ConfigPackageUtility::CreatePackage(packageName); ConfigPackageUtility::CreatePackage(packageName);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
HttpUtility::SendJsonError(response, params, 500, "Could not create package '" + packageName + "'.", HttpUtility::SendJsonError(response, params, 500, "Could not create package '" + packageName + "'.",
DiagnosticInformation(ex, false)); DiagnosticInformation(ex));
return; return;
} }
Dictionary::Ptr result1 = new Dictionary({ Dictionary::Ptr result1 = new Dictionary({
{ "code", 200 }, { "code", 200 },
{ "package", packageName },
{ "status", "Created package." } { "status", "Created package." }
}); });
@ -129,27 +130,23 @@ void ConfigPackagesHandler::HandleDelete(const ApiUser::Ptr& user, HttpRequest&
return; return;
} }
int code = 200;
String status = "Deleted package.";
DictionaryData result1;
try { try {
ConfigPackageUtility::DeletePackage(packageName); ConfigPackageUtility::DeletePackage(packageName);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
code = 500; HttpUtility::SendJsonError(response, params, 500, "Failed to delete package '" + packageName + "'.",
status = "Failed to delete package."; DiagnosticInformation(ex));
if (HttpUtility::GetLastParameter(params, "verboseErrors"))
result1.emplace_back("diagnostic information", DiagnosticInformation(ex));
} }
result1.emplace_back("package", packageName); Dictionary::Ptr result1 = new Dictionary({
result1.emplace_back("code", code); { "code", 200 },
result1.emplace_back("status", status); { "package", packageName },
{ "status", "Created package." }
Dictionary::Ptr result = new Dictionary({
{ "results", new Array({ new Dictionary(std::move(result1)) }) }
}); });
response.SetStatus(code, (code == 200) ? "OK" : "Internal Server Error"); Dictionary::Ptr result = new Dictionary({
{ "results", new Array({ result1 }) }
});
response.SetStatus(200, "OK");
HttpUtility::SendJsonBody(response, params, result); HttpUtility::SendJsonBody(response, params, result);
} }