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

Added ability to set debug level for MistProc* binaries, added support for global debug level for same.

Browse source
This commit is contained in:
Thulinma 2020-08-18 22:51:05 +02:00
parent d47603615f
commit fc7a460c49
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/input/input_buffer.cpp
View file

@ -686,7 +686,7 @@ namespace Mist{
// used for building args // used for building args
int err = fileno(stderr); int err = fileno(stderr);
char *argarr[3]; char *argarr[5];
// Convert to strings // Convert to strings
jsonForEachConst(procs, it){ jsonForEachConst(procs, it){
@ -740,15 +740,27 @@ namespace Mist{
} }
} }
std::string debugLvl;
// start up new/changed connectors // start up new/changed connectors
while (newProcs.size() && config->is_active){ while (newProcs.size() && config->is_active){
std::string config = (*newProcs.begin()); const std::string & config = (*newProcs.begin());
JSON::Value args = JSON::fromString(config);
if (!runningProcs.count(config) || !Util::Procs::isActive(runningProcs[config])){ if (!runningProcs.count(config) || !Util::Procs::isActive(runningProcs[config])){
std::string procname = std::string procname =
Util::getMyPath() + "MistProc" + JSON::fromString(config)["process"].asString(); Util::getMyPath() + "MistProc" + JSON::fromString(config)["process"].asString();
argarr[0] = (char *)procname.c_str(); argarr[0] = (char *)procname.c_str();
argarr[1] = (char *)config.c_str(); argarr[1] = (char *)config.c_str();
argarr[2] = 0; argarr[2] = 0;
if (Util::Config::printDebugLevel != DEBUG || args.isMember("debug")){
if (args.isMember("debug")){
debugLvl = args["debug"].asString();
}else{
debugLvl = JSON::Value(Util::Config::printDebugLevel).asString();
}
argarr[2] = (char*)"--debug";
argarr[3] = (char*)debugLvl.c_str();;
argarr[4] = 0;
}
INFO_MSG("Starting process: %s %s", argarr[0], argarr[1]); INFO_MSG("Starting process: %s %s", argarr[0], argarr[1]);
runningProcs[*newProcs.begin()] = Util::Procs::StartPiped(argarr, 0, 0, &err); runningProcs[*newProcs.begin()] = Util::Procs::StartPiped(argarr, 0, 0, &err);
} }