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

Added "minimal" API request for requesting minimal responses only.

Browse source
This commit is contained in:
Thulinma 2015-11-27 10:43:22 +01:00
parent 22467d603e
commit bf180a2a35
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/controller/controller_api.cpp
View file

@ -483,27 +483,30 @@ int Controller::handleAPIConnection(Socket::Connection & conn){
} }
#endif #endif
/*LTS-END*/ /*LTS-END*/
//sent current configuration, no matter if it was changed or not
Response["config"] = Controller::Storage["config"];
Response["config"]["version"] = PACKAGE_VERSION;
/*LTS-START*/ /*LTS-START*/
if (!Request.isMember("streams") && (Request.isMember("addstream") || Request.isMember("deletestream"))){ if (!Request.isMember("minimal") || Request.isMember("streams") || Request.isMember("addstream") || Request.isMember("deletestream")){
Response["streams"]["incomplete list"] = 1ll; if (!Request.isMember("streams") && (Request.isMember("addstream") || Request.isMember("deletestream"))){
if (Request.isMember("addstream")){ Response["streams"]["incomplete list"] = 1ll;
jsonForEach(Request["addstream"], jit){ if (Request.isMember("addstream")){
if (Controller::Storage["streams"].isMember(jit.key())){ jsonForEach(Request["addstream"], jit){
Response["streams"][jit.key()] = Controller::Storage["streams"][jit.key()]; if (Controller::Storage["streams"].isMember(jit.key())){
Response["streams"][jit.key()] = Controller::Storage["streams"][jit.key()];
}
} }
} }
}else{
Response["streams"] = Controller::Storage["streams"];
}
}
//sent current configuration, if not minimal or was changed/requested
if (!Request.isMember("minimal") || Response.isMember("config")){
Response["config"] = Controller::Storage["config"];
Response["config"]["version"] = PACKAGE_VERSION;
//add required data to the current unix time to the config, for syncing reasons
Response["config"]["time"] = Util::epoch();
if ( !Response["config"].isMember("serverid")){
Response["config"]["serverid"] = "";
} }
}else{
/*LTS-END*/
Response["streams"] = Controller::Storage["streams"];
}//LTS
//add required data to the current unix time to the config, for syncing reasons
Response["config"]["time"] = Util::epoch();
if ( !Response["config"].isMember("serverid")){
Response["config"]["serverid"] = "";
} }
//sent any available logs and statistics //sent any available logs and statistics
/// ///
@ -521,14 +524,17 @@ int Controller::handleAPIConnection(Socket::Connection & conn){
/// ~~~~~~~~~~~~~~~ /// ~~~~~~~~~~~~~~~
/// It's possible to clear the stored logs by sending an empty `"clearstatlogs"` request. /// It's possible to clear the stored logs by sending an empty `"clearstatlogs"` request.
/// ///
{ if (Request.isMember("clearstatlogs") || !Request.isMember("minimal")){
tthread::lock_guard<tthread::mutex> guard(logMutex); tthread::lock_guard<tthread::mutex> guard(logMutex);
Response["log"] = Controller::Storage["log"]; if (!Request.isMember("minimal")){
Response["log"] = Controller::Storage["log"];
}
//clear log if requested //clear log if requested
if (Request.isMember("clearstatlogs")){ if (Request.isMember("clearstatlogs")){
Controller::Storage["log"].null(); Controller::Storage["log"].null();
} }
} }
/*LTS-END*/
if (Request.isMember("clients")){ if (Request.isMember("clients")){
if (Request["clients"].isArray()){ if (Request["clients"].isArray()){
for (unsigned int i = 0; i < Request["clients"].size(); ++i){ for (unsigned int i = 0; i < Request["clients"].size(); ++i){