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

Fixed multiple public addresses in controller settings, fixed debug level being passed when set to default

Browse source
This commit is contained in:
Thulinma 2020-03-10 14:01:21 +01:00
parent a2beecee64
commit 04a1b394dd
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/controller/controller_connectors.cpp
View file

@ -97,22 +97,37 @@ namespace Controller {
static inline void builPipedPart(JSON::Value & p, char * argarr[], int & argnum, const JSON::Value & argset){ static inline void builPipedPart(JSON::Value & p, char * argarr[], int & argnum, const JSON::Value & argset){
jsonForEachConst(argset, it) { jsonForEachConst(argset, it) {
if (it->isMember("option")){ if (it->isMember("option") && p.isMember(it.key())){
if (p.isMember(it.key())){
p[it.key()] = p[it.key()].asString();
if (p[it.key()].asStringRef().size() > 0){
argarr[argnum++] = (char*)((*it)["option"].asStringRef().c_str());
if (it->isMember("type")){ if (it->isMember("type")){
argarr[argnum++] = (char*)(p[it.key()].asStringRef().c_str()); if ((*it)["type"].asStringRef() == "str" && !p[it.key()].isString()){
p[it.key()] = p[it.key()].asString();
}
if ((*it)["type"].asStringRef() == "uint" || (*it)["type"].asStringRef() == "int" || (*it)["type"].asStringRef() == "debug"){
p[it.key()] = JSON::Value(p[it.key()].asInt()).asString();
}
if ((*it)["type"].asStringRef() == "inputlist" && p[it.key()].isArray()){
jsonForEach(p[it.key()], iVal){
(*iVal) = iVal->asString();
argarr[argnum++] = (char*)((*it)["option"].c_str());
argarr[argnum++] = (char*)((*iVal).c_str());
}
continue;
} }
} }
if (p[it.key()].asStringRef().size() > 0){
argarr[argnum++] = (char*)((*it)["option"].c_str());
argarr[argnum++] = (char*)(p[it.key()].c_str());
}else{ }else{
if (it.key() == "debug"){ if (it.key() == "debug"){
if (Util::Config::printDebugLevel != DEBUG){
static std::string debugLvlStr; static std::string debugLvlStr;
debugLvlStr = JSON::Value(Util::Config::printDebugLevel).asString(); debugLvlStr = JSON::Value(Util::Config::printDebugLevel).asString();
argarr[argnum++] = (char*)((*it)["option"].asStringRef().c_str()); argarr[argnum++] = (char*)((*it)["option"].asStringRef().c_str());
argarr[argnum++] = (char*)debugLvlStr.c_str(); argarr[argnum++] = (char*)debugLvlStr.c_str();
} }
continue;
}
argarr[argnum++] = (char*)((*it)["option"].c_str());
} }
} }
} }