From 285002d9e889359f82be2ddb15d8ca506dea515e Mon Sep 17 00:00:00 2001 From: Brandon Schneider Date: Thu, 4 Feb 2016 22:36:02 -0600 Subject: [PATCH] Add new iocage API call to clean all templates. REST Request: ------------------------------- PUT /sysadm/iocage { "action" : "cleantemplates" } WebSocket Request: ------------------------------- { "args" : { "action" : "cleantemplates" }, "name" : "iocage", "id" : "fooid", "namespace" : "sysadm" } Response: ------------------------------- { "args": { "cleantemplates": { "success": "All templates have been cleaned." } }, "id": "fooid", "name": "response", "namespace": "sysadm" } --- src/server/WebBackend.cpp | 4 ++++ src/server/library/sysadm-iocage.cpp | 23 +++++++++++++++++++++++ src/server/library/sysadm-iocage.h | 1 + 3 files changed, 28 insertions(+) diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp index 04354ae..8d73d90 100644 --- a/src/server/WebBackend.cpp +++ b/src/server/WebBackend.cpp @@ -389,6 +389,10 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIocageRequest(const QJsonVal bool ok = false; if(keys.contains("action")){ QString act = JsonValueToString(in_args.toObject().value("action")); + if(act=="cleantemplates"){ + ok = true; + out->insert("cleantemplates", sysadm::Iocage::cleanTemplates()); + } if(act=="cleanreleases"){ ok = true; out->insert("cleanreleases", sysadm::Iocage::cleanReleases()); diff --git a/src/server/library/sysadm-iocage.cpp b/src/server/library/sysadm-iocage.cpp index 0ebdab1..4ec1670 100644 --- a/src/server/library/sysadm-iocage.cpp +++ b/src/server/library/sysadm-iocage.cpp @@ -12,6 +12,29 @@ using namespace sysadm; //PLEASE: Keep the functions in the same order as listed in pcbsd-general.h +// Clean all templates on a box +QJsonObject Iocage::cleanTemplates() { + QJsonObject retObject; + + QStringList output = General::RunCommand("iocage clean -ft ").split("\n"); + + for ( int i = 0; i < output.size(); i++) + { + // This means either a mount is stuck or a jail cannot be stopped, + // give them the error. + if ( output.at(i).indexOf("ERROR:") != -1 ) { + retObject.insert("error", output.at(i)); + break; + } else { + // iocage does a spinner for these that is distracting to see returned, + // returning what a user wants to actually see. + retObject.insert("success", "All templates have been cleaned."); + } + } + + return retObject; +} + // Clean all RELEASEs on a box QJsonObject Iocage::cleanReleases() { QJsonObject retObject; diff --git a/src/server/library/sysadm-iocage.h b/src/server/library/sysadm-iocage.h index 58745db..ff99c7b 100644 --- a/src/server/library/sysadm-iocage.h +++ b/src/server/library/sysadm-iocage.h @@ -14,6 +14,7 @@ namespace sysadm{ class Iocage{ public: + static QJsonObject cleanTemplates(); static QJsonObject cleanReleases(); static QJsonObject cleanJails(); static QJsonObject capJail(QJsonObject);