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

Fixed controller breaking when all connectors are deleted simultaneously.

Browse source
This commit is contained in:
Thulinma 2015-10-13 15:34:24 +02:00
parent a389234224
commit 2f4a4660d0
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/controller/controller_connectors.cpp
View file

@ -139,15 +139,20 @@ namespace Controller {
bool action = false;
//shut down deleted/changed connectors
std::map<std::string, pid_t>::iterator it;
for (it = currentConnectors.begin(); it != currentConnectors.end(); it++){
if (!runningConns.count(it->first)){
if (Util::Procs::isActive(it->second)){
Log("CONF", "Stopping connector " + it->first);
action = true;
Util::Procs::Stop(it->second);
if (currentConnectors.size()){
for (it = currentConnectors.begin(); it != currentConnectors.end(); it++){
if (!runningConns.count(it->first)){
if (Util::Procs::isActive(it->second)){
Log("CONF", "Stopping connector " + it->first);
action = true;
Util::Procs::Stop(it->second);
}
currentConnectors.erase(it);
if (!currentConnectors.size()){
break;
}
it = currentConnectors.begin();
}
currentConnectors.erase(it);
it = currentConnectors.begin();
}
}