libtransport.git Changeset - ce44c83ae8f5

Changeset - ce44c83ae8f5

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-07-24 21:41:52
hanzz.k@gmail.com

disconnect_all_slots in networkpluginserver

4 files changed with 5 insertions and 5 deletions:

backends/libircclient-qt/CMakeLists.txt

backends/libpurple/CMakeLists.txt

spectrum/src/sample.cfg

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

backends/libircclient-qt/CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp)
 FILE(GLOB HEADERS *.h)
 QT4_WRAP_CPP(SRC ${HEADERS})
 ADD_EXECUTABLE(spectrum_libircclient-qt_backend ${SRC})
 target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport)
+target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport pthread)
 INSTALL(TARGETS spectrum_libircclient-qt_backend RUNTIME DESTINATION bin)

backends/libpurple/CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(spectrum_libpurple_backend ${SRC})
 target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport)
+target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport pthread)
 INSTALL(TARGETS spectrum_libpurple_backend RUNTIME DESTINATION bin)

spectrum/src/sample.cfg

➞

Show inline comments

 [service]
 jid = localhost
 password = secret
 server = 127.0.0.1
 port = 5222
 server_mode = 1
 backend_host=localhost # < this option doesn't work yet
 backend_port=10001
 admin_username=admin
 admin_password=test
 #cert= #patch to PKCS#12 certificate
 #cert_password= #password to that certificate if any
-users_per_backend=1
+users_per_backend=10
 backend=../../backends/libpurple/spectrum_libpurple_backend
 #backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 #protocol=prpl-jabber
 protocol=prpl-msn
 #protocol=prpl-icq
 [backend]
 default_avatar=catmelonhead.jpg
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends

src/networkpluginserver.cpp

➞

Show inline comments

+	}
+}
 void NetworkPluginServer::handleSessionFinished(Backend *c) {
 	LOG4CXX_INFO(logger, "Backend " << c << " disconnected. Current backend count=" << (m_clients.size() - 1));
 	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(boost::bind(&NetworkPluginServer::handleSessionFinished, this, c));
 	c->connection->onDataRead.disconnect(boost::bind(&NetworkPluginServer::handleDataRead, this, c, _1));
 	c->connection->onDisconnected.disconnect_all_slots();
 	c->connection->onDataRead.disconnect_all_slots();
 	m_clients.remove(c);
 	delete c;
 	// Execute new session only if there's no free one after this crash/disconnection
 	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		if ((*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend")) {
 			return;
+		}
+	}
 	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());
+}

0 comments (0 inline, 0 general)