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

Fixed updateProtocol not restarting protocols with correct parameters.

Browse source 
Signed-off-by: Thulinma <jaron@vietors.com>
This commit is contained in:
Thulinma 2014-01-13 15:01:09 +01:00
parent 2b7b7e85ac
commit a4baed35d2
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/controller/controller_connectors.cpp
View file

@ -27,18 +27,8 @@ namespace Controller {
std::map<long long, std::string>::iterator iter; std::map<long long, std::string>::iterator iter;
for (iter = currentConnectors.begin(); iter != currentConnectors.end(); iter++){ for (iter = currentConnectors.begin(); iter != currentConnectors.end(); iter++){
if (iter->second.substr(0, protocol.size()) == protocol){ if (iter->second.substr(0, protocol.size()) == protocol){
Log("CONF", "Restarting connector for update: " + iter->second); Log("CONF", "Killing connector for update: " + iter->second);
Util::Procs::Stop(toConn(iter->first)); Util::Procs::Stop(toConn(iter->first));
int i = 0;
while (Util::Procs::isActive(toConn(iter->first)) && i < 30){
Util::sleep(100);
}
if (i >= 30){
Log("WARN", "Connector still active 3 seconds after shutdown - delaying restart.");
}else{
Util::Procs::Start(toConn(iter->first), Util::getMyPath() + iter->second);
}
return;
} }
} }
} }