libtransport.git Changeset - 090a7e5e230b

Changeset - 090a7e5e230b

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Jan Kaluza - 14 years ago 2011-07-20 08:17:55
hanzz.k@gmail.com

Fixed crazy backends spawning when one backend stopped sending PONGs

4 files changed with 19 insertions and 24 deletions:

include/transport/networkpluginserver.h

include/transport/usermanager.h

src/networkpluginserver.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -43,7 +43,7 @@ class RosterResponder; @@
 class NetworkPluginServer {
 	public:
 		struct Backend {
-			bool pongReceived;
+			int pongReceived;
 			std::list<User *> users;
 			Swift::SafeByteArray data;
 			boost::shared_ptr<Swift::Connection> connection;

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -89,7 +89,7 @@ class UserManager { @@
 		void handleGeneralPresenceReceived(Swift::Presence::ref presence);
 		void handleProbePresence(Swift::Presence::ref presence);
 		void handleSubscription(Swift::Presence::ref presence);
-		void handleRemoveTimeout(User *user);
+		void handleRemoveTimeout(const std::string jid);
 // 		void handleDiscoInfoResponse(boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid);
 		void addUser(User *user);

src/networkpluginserver.cpp

➞

Show inline comments

 	m_userManager->onUserCreated.connect(boost::bind(&NetworkPluginServer::handleUserCreated, this, _1));
 	m_userManager->onUserDestroyed.connect(boost::bind(&NetworkPluginServer::handleUserDestroyed, this, _1));
-	m_pingTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(10000);
+	m_pingTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(20000);
 	m_pingTimer->onTick.connect(boost::bind(&NetworkPluginServer::pingTimeout, this));
 	m_pingTimer->start();
@@ @@ -177,7 +177,7 @@ NetworkPluginServer::~NetworkPluginServer() { @@
 void NetworkPluginServer::handleNewClientConnection(boost::shared_ptr<Swift::Connection> c) {
 	Backend *client = new Backend;
-	client->pongReceived = true;
+	client->pongReceived = -1;
 	client->connection = c;
 	client->res = 0;
 	client->init_res = 0;
 	c->onDisconnected.connect(boost::bind(&NetworkPluginServer::handleSessionFinished, this, client));
 	c->onDataRead.connect(boost::bind(&NetworkPluginServer::handleDataRead, this, client, _1));
 	sendPing(client);
 	client->pongReceived = -1;
 	// some users are in queue waiting for this backend
 	while(!m_waitingUsers.empty()) {
 void NetworkPluginServer::pingTimeout() {
 	// check ping responses
 	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		if ((*it)->pongReceived) {
+		if ((*it)->pongReceived || (*it)->pongReceived == -1) {
 			sendPing((*it));
+		}
 		else {
 			exec_(CONFIG_STRING(m_config, "service.backend").c_str(), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
 			LOG4CXX_INFO(logger, "Disconnecting backend " << (*it) << ". PING response not received.");
 			(*it)->connection->disconnect();
 			(*it)->connection.reset();
+		}
+	}
 	m_pingTimer->start();
+}
 	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		// This backend is free.
 		if ((*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend")) {
 			// After this user, this backend could be full, so we have to spawn new one...
 			if ((*it)->users.size() + 1 >= CONFIG_INT(m_config, "service.users_per_backend")) {
 				spawnNew = true;
+			}
 			if (c == NULL) {
 				c = *it;
+			}
 			else {
 				if ((*it)->users.size() + 1 != CONFIG_INT(m_config, "service.users_per_backend")) {
 					spawnNew = false;
 					break;
+				}
+			}
 			c = *it;
 			break;
+		}
+	}
-	if (spawnNew || c == NULL) {
 	if (c == NULL) {
 		exec_(CONFIG_STRING(m_config, "service.backend").c_str(), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
+	}

src/usermanager.cpp

➞

Show inline comments

 			Swift::Presence::ref highest = m_component->getPresenceOracle()->getHighestPriorityPresence(presence->getFrom().toBare());
 			// There's no presence for this user, so disconnect
 			if (!highest || (highest && highest->getType() == Swift::Presence::Unavailable)) {
 				m_removeTimer->onTick.connect(boost::bind(&UserManager::handleRemoveTimeout, this, user));
+				m_removeTimer->onTick.connect(boost::bind(&UserManager::handleRemoveTimeout, this, user->getJID().toBare().toString()));
 				m_removeTimer->start();
+			}
+		}
+	}
+}
 void UserManager::handleRemoveTimeout(User *user) {
 	removeUser(user);
 void UserManager::handleRemoveTimeout(const std::string jid) {
 	User *user = getUser(jid);
 	if (user) {
 		removeUser(user);
+	}
+}
 void UserManager::handleMessageReceived(Swift::Message::ref message) {

0 comments (0 inline, 0 general)