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

Fixed race condition in prometheus output when adding new protocols

Browse source
This commit is contained in:
Thulinma 2018-06-14 15:01:42 +02:00
parent ebdaf6e063
commit fc6d49ac1f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/controller/controller_statistics.cpp
View file

@ -1753,8 +1753,9 @@ void Controller::handlePrometheus(HTTP::Parser & H, Socket::Connection & conn, i
//Loop over connectors //Loop over connectors
const JSON::Value &caps = capabilities["connectors"]; const JSON::Value &caps = capabilities["connectors"];
jsonForEachConst(Storage["config"]["protocols"], prtcl){ jsonForEachConst(Storage["config"]["protocols"], prtcl){
if (!(*prtcl).isMember("connector")){continue;}
const std::string &cName = (*prtcl)["connector"].asStringRef(); const std::string &cName = (*prtcl)["connector"].asStringRef();
if ((*prtcl)["online"].asInt() != 1){continue;} if (!(*prtcl).isMember("online") || (*prtcl)["online"].asInt() != 1){continue;}
if (!caps.isMember(cName)){continue;} if (!caps.isMember(cName)){continue;}
const JSON::Value & capa = caps[cName]; const JSON::Value & capa = caps[cName];
if (!capa.isMember("optional") || !capa["optional"].isMember("port")){continue;} if (!capa.isMember("optional") || !capa["optional"].isMember("port")){continue;}