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

Better display of "enabled" protocols that used to display as unavailable.

Browse source
This commit is contained in:
Thulinma 2014-06-20 19:51:34 +02:00
parent c040a35267
commit f09e58e034
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/controller/controller_connectors.cpp
View file

@ -117,6 +117,12 @@ namespace Controller {
} }
#define connCapa capabilities["connectors"][connName] #define connCapa capabilities["connectors"][connName]
if (connCapa.isMember("socket")){
( *ait)["online"] = "Enabled";
continue;
}
if (connCapa.isMember("required")){ if (connCapa.isMember("required")){
bool gotAll = true; bool gotAll = true;
for (JSON::ObjIter it = connCapa["required"].ObjBegin(); it != connCapa["required"].ObjEnd(); ++it){ for (JSON::ObjIter it = connCapa["required"].ObjBegin(); it != connCapa["required"].ObjEnd(); ++it){
@ -155,7 +161,7 @@ namespace Controller {
//start up new/changed connectors //start up new/changed connectors
for (iter = new_connectors.begin(); iter != new_connectors.end(); iter++){ for (iter = new_connectors.begin(); iter != new_connectors.end(); iter++){
if (currentConnectors.count(iter->first) != 1 || currentConnectors[iter->first] != iter->second || !Util::Procs::isActive(toConn(iter->first))){ if (currentConnectors.count(iter->first) != 1 || currentConnectors[iter->first] != iter->second || !Util::Procs::isActive(toConn(iter->first))){
if ( capabilities["connectors"][p[iter->first]["connector"].asString()].isMember("socket") ) {continue;} if ( capabilities["connectors"][p[iter->first]["connector"].asString()].isMember("socket") ) {continue;}
Log("CONF", "Starting connector: " + iter->second); Log("CONF", "Starting connector: " + iter->second);
// clear out old args // clear out old args
for (i=0; i<15; i++){argarr[i] = 0;} for (i=0; i<15; i++){argarr[i] = 0;}