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

post-merge

Browse source
This commit is contained in:
Erik Zandvliet 2011-10-16 18:27:27 +02:00
commit 5f1bab2a7b
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
DDV_Controller/main.cpp
View file

@ -89,21 +89,19 @@ void Authorize( Json::Value & Request, Json::Value & Storage, Json::Value & Resp
return; return;
} }
void CheckConfig(Json::Value & in, Json::Value & out){ void CheckConfig(Json::Value & in, Json::Value & out, Json::Value & Storage){
printf( "In:\t%s\n", in.toStyledString().c_str() ); if (in.isObject() && (in.size() > 0)){
printf( "Out:\t%s\n", out.toStyledString().c_str() ); for (Json::ValueIterator jit = in.begin(); jit != in.end(); jit++){
if (in.isObject()){
for( Json::Value::iterator jit = in.begin(); jit != in.end(); jit++){
if (out.isObject() && out.isMember(jit.memberName())){ if (out.isObject() && out.isMember(jit.memberName())){
Log("CONF", std::string("Updated configuration value ")+jit.memberName(), out); Log("CONF", std::string("Updated configuration value ")+jit.memberName(), Storage);
}else{ }else{
Log("CONF", std::string("New configuration value ")+jit.memberName(), out); Log("CONF", std::string("New configuration value ")+jit.memberName(), Storage);
} }
} }
if (out.isObject()){ if (out.isObject() && (out.size() > 0)){
for ( Json::Value::iterator jit = out.begin(); jit != out.end(); jit++){ for (Json::ValueIterator jit = out.begin(); jit != out.end(); jit++){
if (!in.isMember(jit.memberName())){ if (!in.isMember(jit.memberName())){
Log("CONF", std::string("Deleted configuration value ")+jit.memberName(), out); Log("CONF", std::string("Deleted configuration value ")+jit.memberName(), Storage);
} }
} }
} }
@ -112,19 +110,18 @@ printf( "Out:\t%s\n", out.toStyledString().c_str() );
} }
void CheckStreams(Json::Value & in, Json::Value & out){ void CheckStreams(Json::Value & in, Json::Value & out){
Json::ValueIterator jit; if (in.isObject() && (in.size() > 0)){
if (in.isObject()){ for (Json::ValueIterator jit = in.begin(); jit != in.end(); jit++){
for (jit = in.begin(); jit != in.end(); jit++){ if (out.isObject() && out.isMember(jit.memberName())){
if (out.isObject() && out.isMember(jit.key().asString())){ Log("CONF", std::string("Updated stream ")+jit.memberName(), Storage);
Log("STRM", "Updated stream "+jit.key().asString(), out);
}else{ }else{
Log("STRM", "New stream "+jit.key().asString(), out); Log("CONF", std::string("New stream ")+jit.memberName(), Storage);
} }
} }
if (out.isObject()){ if (out.isObject() && (out.size() > 0)){
for (jit = out.begin(); jit != out.end(); jit++){ for (Json::ValueIterator jit = out.begin(); jit != out.end(); jit++){
if (!in.isMember(jit.key().asString())){ if (!in.isMember(jit.memberName())){
Log("STRM", "Deleted stream "+jit.key().asString(), out); Log("CONF", std::string("Deleted stream ")+jit.memberName(), Storage);
} }
} }
} }
@ -145,6 +142,8 @@ int main() {
std::string jsonp; std::string jsonp;
JsonParse.parse(ReadFile("config.json"), Storage, false); JsonParse.parse(ReadFile("config.json"), Storage, false);
Storage["config"] = Json::Value(Json::objectValue); Storage["config"] = Json::Value(Json::objectValue);
Storage["log"] = Json::Value(Json::arrayValue);
Storage["statistics"] = Json::Value(Json::arrayValue);
Storage["account"]["gearbox"]["password"] = Json::Value("7e0f87b116377621a75a6440ac74dcf4"); Storage["account"]["gearbox"]["password"] = Json::Value("7e0f87b116377621a75a6440ac74dcf4");
while (API_Socket.connected()){ while (API_Socket.connected()){
usleep(10000); //sleep for 10 ms - prevents 100% CPU time usleep(10000); //sleep for 10 ms - prevents 100% CPU time
@ -166,7 +165,7 @@ int main() {
Authorize(Request, Storage, Response, (*it)); Authorize(Request, Storage, Response, (*it));
if (it->Authorized){ if (it->Authorized){
//Parse config and streams from the request. //Parse config and streams from the request.
if (Request.isMember("config")){CheckConfig(Request["config"], Storage["config"]);} if (Request.isMember("config")){CheckConfig(Request["config"], Storage["config"], Storage);}
//if (Request.isMember("streams")){CheckStreams(Request["streams"], Storage["streams"]);} //if (Request.isMember("streams")){CheckStreams(Request["streams"], Storage["streams"]);}
//sent current configuration, no matter if it was changed or not //sent current configuration, no matter if it was changed or not
//Response["streams"] = Storage["streams"]; //Response["streams"] = Storage["streams"];