hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added "config_backup" and "config_restore" API calls, moved "save" API call to always be last executed (guaranteeing same-call edits are part of the saved version)

Browse source
This commit is contained in:
Thulinma 2020-11-29 00:36:30 +01:00
parent 9f2fe22074
commit 570ed76bd2
1 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/controller/controller_api.cpp
View file

@ -509,6 +509,33 @@ void Controller::handleAPICommands(JSON::Value &Request, JSON::Value &Response){
} }
} }
/*LTS-END*/ /*LTS-END*/
if (Request.isMember("config_backup")){
std::set<std::string> skip;
skip.insert("log");
skip.insert("online");
skip.insert("error");
Response["config_backup"].assignFrom(Controller::Storage, skip);
}
if (Request.isMember("config_restore")){
std::set<std::string> skip;
skip.insert("log");
skip.insert("online");
skip.insert("error");
Controller::CheckStreams(Request["config_restore"]["streams"], Controller::Storage["streams"]);
Request["config_restore"]["streams"] = Controller::Storage["streams"];
Controller::Storage.assignFrom(Request["config_restore"], skip);
removeDuplicateProtocols();
Controller::accesslog = Controller::Storage["config"]["accesslog"].asStringRef();
Controller::prometheus = Controller::Storage["config"]["prometheus"].asStringRef();
if (Util::printDebugLevel != (Controller::Storage["config"]["debug"].isInt() ? Controller::Storage["config"]["debug"].asInt() : DEBUG)){
Util::printDebugLevel = (Controller::Storage["config"]["debug"].isInt() ? Controller::Storage["config"]["debug"].asInt() : DEBUG);
INFO_MSG("Debug level set to %u", Util::printDebugLevel);
}
WARN_MSG("Restored configuration over API, replacing previous configuration entirely");
}
// Parse config and streams from the request. // Parse config and streams from the request.
if (Request.isMember("config") && Request["config"].isObject()){ if (Request.isMember("config") && Request["config"].isObject()){
const JSON::Value &in = Request["config"]; const JSON::Value &in = Request["config"];
@ -810,11 +837,6 @@ void Controller::handleAPICommands(JSON::Value &Request, JSON::Value &Response){
} }
} }
if (Request.isMember("save")){
Controller::Log("CONF", "Writing config to file on request through API");
Controller::writeConfigToDisk();
}
if (Request.isMember("ui_settings")){ if (Request.isMember("ui_settings")){
if (Request["ui_settings"].isObject()){Storage["ui_settings"] = Request["ui_settings"];} if (Request["ui_settings"].isObject()){Storage["ui_settings"] = Request["ui_settings"];}
Response["ui_settings"] = Storage["ui_settings"]; Response["ui_settings"] = Storage["ui_settings"];
@ -1049,4 +1071,10 @@ void Controller::handleAPICommands(JSON::Value &Request, JSON::Value &Response){
Controller::writeConfig(); Controller::writeConfig();
Controller::configChanged = false; Controller::configChanged = false;
if (Request.isMember("save")){
Controller::Log("CONF", "Writing config to file on request through API");
Controller::writeConfigToDisk();
}
} }