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

More config stages refactoring

This commit is contained in:
Michael Friedrich 2018-04-06 10:13:08 +02:00
parent 36cdf8a0d2
commit 4bf731fc16
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/remote/configstageshandler.cpp
View File

@ -98,6 +98,7 @@ void ConfigStagesHandler::HandlePost(const ApiUser::Ptr& user, HttpRequest& requ
return HttpUtility::SendJsonError(response, params, 400, "Invalid package name '" + packageName + "'."); return HttpUtility::SendJsonError(response, params, 400, "Invalid package name '" + packageName + "'.");
bool reload = true; bool reload = true;
if (params->Contains("reload")) if (params->Contains("reload"))
reload = HttpUtility::GetLastParameter(params, "reload"); reload = HttpUtility::GetLastParameter(params, "reload");
@ -116,13 +117,17 @@ void ConfigStagesHandler::HandlePost(const ApiUser::Ptr& user, HttpRequest& requ
ConfigPackageUtility::AsyncTryActivateStage(packageName, stageName, reload); ConfigPackageUtility::AsyncTryActivateStage(packageName, stageName, reload);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
return HttpUtility::SendJsonError(response, params, 500, return HttpUtility::SendJsonError(response, params, 500,
"Stage creation failed for '" + stageName + "'.", "Stage creation failed.",
DiagnosticInformation(ex, false)); DiagnosticInformation(ex));
} }
String responseStatus = "Created stage. "; String responseStatus = "Created stage. ";
responseStatus += (reload ? " Icinga2 will reload." : " Icinga2 reload skipped.");
if (reload)
responseStatus += "Reload triggered.";
else
responseStatus += "Reload skipped.";
Dictionary::Ptr result1 = new Dictionary({ Dictionary::Ptr result1 = new Dictionary({
{ "package", packageName }, { "package", packageName },
@ -163,11 +168,13 @@ void ConfigStagesHandler::HandleDelete(const ApiUser::Ptr& user, HttpRequest& re
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
return HttpUtility::SendJsonError(response, params, 500, return HttpUtility::SendJsonError(response, params, 500,
"Failed to delete stage '" + stageName + "' in package '" + packageName + "'.", "Failed to delete stage '" + stageName + "' in package '" + packageName + "'.",
DiagnosticInformation(ex, false)); DiagnosticInformation(ex));
} }
Dictionary::Ptr result1 = new Dictionary({ Dictionary::Ptr result1 = new Dictionary({
{ "code", 200 }, { "code", 200 },
{ "package", packageName },
{ "stage", stageName },
{ "status", "Stage deleted." } { "status", "Stage deleted." }
}); });