From a4baed35d23c0381ca8aad5d6f71bf7237913f42 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 13 Jan 2014 15:01:09 +0100 Subject: [PATCH] Fixed updateProtocol not restarting protocols with correct parameters. Signed-off-by: Thulinma --- src/controller/controller_connectors.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/controller/controller_connectors.cpp b/src/controller/controller_connectors.cpp index ccbb3e08..e6ce4bff 100644 --- a/src/controller/controller_connectors.cpp +++ b/src/controller/controller_connectors.cpp @@ -27,18 +27,8 @@ namespace Controller { std::map::iterator iter; for (iter = currentConnectors.begin(); iter != currentConnectors.end(); iter++){ 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)); - 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; } } }