libtransport.git Changeset - 80bea5b6bcca

Changeset - 80bea5b6bcca

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-09-02 21:43:22
hanzz.k@gmail.com

Don't call handleSessionFinished twice in some rare situations

1 file changed with 13 insertions and 13 deletions:

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

src/networkpluginserver.cpp

➞

Show inline comments

 	for (std::list<User *>::const_iterator it = c->users.begin(); it != c->users.end(); it++) {
 		LOG4CXX_ERROR(logger, "Backend " << c << " disconnected (probably crashed) with active user " << (*it)->getJID().toString());
 		(*it)->setData(NULL);
 		(*it)->handleDisconnected("Internal Server Error, please reconnect.");
+	}
 // 	c->connection->onDisconnected.disconnect_all_slots();
 // 	c->connection->onDataRead.disconnect_all_slots();
 	c->connection->onDisconnected.disconnect_all_slots();
 	c->connection->onDataRead.disconnect_all_slots();
 	c->connection->disconnect();
 	c->connection.reset();
 	m_clients.remove(c);
 	delete c;
+}
 void NetworkPluginServer::handleConnectedPayload(const std::string &data) {
@@ @@ -653,36 +655,36 @@ void NetworkPluginServer::pingTimeout() { @@
 		LOG4CXX_INFO(logger, "Moving user " << u->getJID().toString() << " to long-running backend");
 		if (!moveToLongRunBackend(u))
 			break;
+	}
 	// check ping responses
 	std::vector<Backend *> toRemove;
 	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		// pong has been received OR backend just connected and did not have time to answer the ping
 		// request.
 		if ((*it)->pongReceived || (*it)->pongReceived == -1) {
 			sendPing((*it));
+		}
 		else {
 			LOG4CXX_INFO(logger, "Disconnecting backend " << (*it) << ". PING response not received.");
 			if ((*it)->connection) {
 				(*it)->connection->disconnect();
 				(*it)->connection.reset();
+			}
 // 			handleSessionFinished((*it));
 			toRemove.push_back(*it);
+		}
 		if ((*it)->users.size() == 0) {
 			LOG4CXX_INFO(logger, "Disconnecting backend " << (*it) << ". There are no users.");
 			if ((*it)->connection) {
 				(*it)->connection->disconnect();
 				(*it)->connection.reset();
 			toRemove.push_back(*it);
+		}
+	}
 	BOOST_FOREACH(Backend *b, toRemove) {
 		handleSessionFinished(b);
+	}
 	m_pingTimer->start();
+}
 void NetworkPluginServer::collectBackend() {
 	// Stop accepting new users to backend with the biggest memory usage. This prevents backends
 	// which are leaking to eat whole memory by connectin new users to legacy network.
 		return;
+	}
 	send(c->connection, message);
 	c->users.remove(user);
 	if (c->users.size() == 0) {
 		LOG4CXX_INFO(logger, "Disconnecting backend " << c << ". There are no users.");
 		c->connection->disconnect();
 		c->connection.reset();
-// 		handleSessionFinished(c);
 		handleSessionFinished(c);
 // 		m_clients.erase(user->connection);
+	}
+}
 void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost::shared_ptr<Swift::Message> &msg) {
 	conv->getConversationManager()->getUser()->updateLastActivity();

0 comments (0 inline, 0 general)