stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Give backend some time to start before spawning new oen

Browse source
This commit is contained in:
HanzZ 2012-07-28 06:04:10 +02:00
parent 489ceea488
commit 95a4924622
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/transport/networkpluginserver.h
View file

@ -152,6 +152,7 @@ class NetworkPluginServer {
FileTransferManager *m_ftManager;
std::vector<std::string> m_crashedBackends;
AdminInterface *m_adminInterface;
bool m_startingBackend;
};
}

9
src/networkpluginserver.cpp
View file

@ -229,6 +229,7 @@ NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, U
m_component = component;
m_isNextLongRun = false;
m_adminInterface = NULL;
m_startingBackend = false;
m_component->m_factory = new NetworkFactory(this);
m_userManager->onUserCreated.connect(boost::bind(&NetworkPluginServer::handleUserCreated, this, _1));
m_userManager->onUserDestroyed.connect(boost::bind(&NetworkPluginServer::handleUserDestroyed, this, _1));
@ -325,6 +326,8 @@ void NetworkPluginServer::handleNewClientConnection(boost::shared_ptr<Swift::Con
client->acceptUsers = !m_isNextLongRun;
client->longRun = m_isNextLongRun;
m_startingBackend = false;
LOG4CXX_INFO(logger, "New" + (client->longRun ? std::string(" long-running") : "") + " backend " << client << " connected. Current backend count=" << (m_clients.size() + 1));
m_clients.push_front(client);
@ -930,6 +933,9 @@ void NetworkPluginServer::pingTimeout() {
}
}
// We have to remove startingBackend flag otherwise 1 broken backend start could
// block the backend.
m_startingBackend = false;
// check ping responses
std::vector<Backend *> toRemove;
@ -1472,8 +1478,9 @@ NetworkPluginServer::Backend *NetworkPluginServer::getFreeClient(bool acceptUser
}
// there's no free backend, so spawn one.
if (c == NULL) {
if (c == NULL && !m_startingBackend) {
m_isNextLongRun = longRun;
m_startingBackend = true;
exec_(CONFIG_STRING(m_config, "service.backend"), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
}