libtransport.git Changeset - 97a6609c8731

Changeset - 97a6609c8731

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-12-07 18:20:28
hanzz.k@gmail.com

maybe working auto-reconnect

4 files changed with 22 insertions and 3 deletions:

include/Swiften/Elements/SpectrumErrorPayload.h

include/transport/networkpluginserver.h

src/networkpluginserver.cpp

src/user.cpp

0 comments (0 inline, 0 general)

include/Swiften/Elements/SpectrumErrorPayload.h

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ namespace Swift { @@
 				CONNECTION_ERROR_CERT_EXPIRED = 10,
 				CONNECTION_ERROR_CERT_NOT_ACTIVATED = 11,
 				CONNECTION_ERROR_CERT_HOSTNAME_MISMATCH = 12,
 				CONNECTION_ERROR_CERT_FINGERPRINT_MISMATCH = 13,
 				CONNECTION_ERROR_CERT_SELF_SIGNED = 14,
 				CONNECTION_ERROR_CERT_OTHER_ERROR = 15,
-				CONNECTION_ERROR_OTHER_ERROR = 16,
 				CONNECTION_ERROR_OTHER_ERROR = 16
 			};
 			SpectrumErrorPayload(Error error = CONNECTION_ERROR_OTHER_ERROR);
 			Error getError() const {
 				return error_;

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -52,12 +52,13 @@ class NetworkPluginServer { @@
 			boost::shared_ptr<Swift::Connection> connection;
 			unsigned long res;
 			unsigned long init_res;
 			unsigned long shared;
 			bool acceptUsers;
 			bool longRun;
 			bool willDie;
 		};
 		NetworkPluginServer(Component *component, Config *config, UserManager *userManager, FileTransferManager *ftManager);
 		virtual ~NetworkPluginServer();

src/networkpluginserver.cpp

➞

Show inline comments

 	Backend *client = new Backend;
 	client->pongReceived = -1;
 	client->connection = c;
 	client->res = 0;
 	client->init_res = 0;
 	client->shared = 0;
 	client->willDie = 0;
 	// Backend does not accept new clients automatically if it's long-running
 	client->acceptUsers = !m_isNextLongRun;
 	client->longRun = m_isNextLongRun;
 	LOG4CXX_INFO(logger, "New" + (client->longRun ? std::string(" long-running") : "") +  " backend " << client << " connected. Current backend count=" << (m_clients.size() + 1));
+	}
+}
 void NetworkPluginServer::handleSessionFinished(Backend *c) {
 	LOG4CXX_INFO(logger, "Backend " << c << " disconnected. Current backend count=" << (m_clients.size() - 1));
 	// This backend will do, so we can't reconnect users to it in User::handleDisconnected call
 	c->willDie = true;
 	// If there are users associated with this backend, it must have crashed, so print error output
 	// and disconnect users
 	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.");
@@ @@ -932,13 +936,13 @@ void NetworkPluginServer::handleUserCreated(User *user) { @@
+	}
 	// Associate users with backend
 	user->setData(c);
 	c->users.push_back(user);
-// 	UserInfo userInfo = user->getUserInfo();
+	// Don't forget to disconnect these in handleUserDestroyed!!!
 	user->onReadyToConnect.connect(boost::bind(&NetworkPluginServer::handleUserReadyToConnect, this, user));
 	user->onPresenceChanged.connect(boost::bind(&NetworkPluginServer::handleUserPresenceChanged, this, user, _1));
 	user->onRoomJoined.connect(boost::bind(&NetworkPluginServer::handleRoomJoined, this, user, _1, _2, _3, _4));
 	user->onRoomLeft.connect(boost::bind(&NetworkPluginServer::handleRoomLeft, this, user, _1));
+}
+}
 void NetworkPluginServer::handleUserDestroyed(User *user) {
 	m_waitingUsers.remove(user);
 	UserInfo userInfo = user->getUserInfo();
 	user->onReadyToConnect.disconnect(boost::bind(&NetworkPluginServer::handleUserReadyToConnect, this, user));
 	user->onPresenceChanged.disconnect(boost::bind(&NetworkPluginServer::handleUserPresenceChanged, this, user, _1));
 	user->onRoomJoined.disconnect(boost::bind(&NetworkPluginServer::handleRoomJoined, this, user, _1, _2, _3, _4));
 	user->onRoomLeft.disconnect(boost::bind(&NetworkPluginServer::handleRoomLeft, this, user, _1));
 	pbnetwork::Logout logout;
 	logout.set_user(user->getJID().toBare());
 	logout.set_legacyname(userInfo.uin);
 	std::string message;
 	logout.SerializeToString(&message);
@@ @@ -1349,13 +1358,13 @@ void NetworkPluginServer::sendPing(Backend *c) { @@
 NetworkPluginServer::Backend *NetworkPluginServer::getFreeClient(bool acceptUsers, bool longRun) {
 	NetworkPluginServer::Backend *c = NULL;
 	// Check all backends and find free one
 	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		if ((*it)->acceptUsers == acceptUsers && (*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend") && (*it)->connection && (*it)->longRun == longRun) {
+		if ((*it)->willDie == false && (*it)->acceptUsers == acceptUsers && (*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend") && (*it)->connection && (*it)->longRun == longRun) {
 			c = *it;
 			// if we're not reusing all backends and backend is full, stop accepting new users on this backend
 			if (!CONFIG_BOOL(m_config, "service.reuse_old_backends")) {
 				if (c->users.size() + 1 >= CONFIG_INT(m_config, "service.users_per_backend")) {
 					c->acceptUsers = false;
+				}

src/user.cpp

➞

Show inline comments

@@ @@ -319,12 +319,21 @@ void User::setIgnoreDisconnect(bool ignoreDisconnect) { @@
 void User::handleDisconnected(const std::string &error, Swift::SpectrumErrorPayload::Error e) {
 	if (m_ignoreDisconnect) {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnecting from legacy network ignored (probably moving between backends)");
 		return;
+	}
 	if (e == Swift::SpectrumErrorPayload::CONNECTION_ERROR_OTHER_ERROR || e == Swift::SpectrumErrorPayload::CONNECTION_ERROR_NETWORK_ERROR) {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnecting from legacy network, trying to reconnect automatically.");
 		// Simulate destruction/resurrection :)
 		// TODO: If this stops working, create onReconnect signal
 		m_userManager->onUserDestroyed(this);
 		m_userManager->onUserCreated(this);
 		return;
+	}
 	if (error.empty()) {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnected from legacy network");
+	}
 	else {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnected from legacy network with error " << error);
+	}

0 comments (0 inline, 0 general)