libtransport.git Changeset - 4c885cc94785

Changeset - 4c885cc94785

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-09-09 11:51:25
hanzz.k@gmail.com

Proper SIGTERM/SIGINT handlers

4 files changed with 23 insertions and 3 deletions:

include/transport/usermanager.h

spectrum/src/main.cpp

src/transport.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -71,24 +71,26 @@ class UserManager { @@
 			return m_users;
+		}
 		/// Returns number of online users.
 		/// \return number of online users
 		int getUserCount();
 		/// Removes user. This function disconnects user and safely removes
 		/// User class. This does *not* remove user from StorageBackend.
 		/// \param user User class to remove
 		void removeUser(User *user);
 		void removeAllUsers();
 		/// Called when new User class is created.
 		/// \param user newly created User class
 		boost::signal<void (User *user)> onUserCreated;
 		/// Called when User class is going to be removed
 		/// \param user removed User class
 		boost::signal<void (User *user)> onUserDestroyed;
 		/// Returns true if user is connected.
 		/// \return True if user is connected.
 		bool isUserConnected(const std::string &barejid) const {
 			return m_users.find(barejid) != m_users.end();

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -21,31 +21,39 @@ @@
 #include "log4cxx/patternlayout.h"
 #include "log4cxx/propertyconfigurator.h"
 #include "log4cxx/consoleappender.h"
 #include "libgen.h"
 using namespace log4cxx;
 using namespace Transport;
 static LoggerPtr logger = log4cxx::Logger::getLogger("Spectrum");
 Swift::SimpleEventLoop *eventLoop_ = NULL;
 Component *component_ = NULL;
 UserManager *userManager_ = NULL;
 static void spectrum_sigint_handler(int sig) {
 static void stop_spectrum() {
 	userManager_->removeAllUsers();
 	component_->stop();
 	eventLoop_->stop();
+}
 static void spectrum_sigint_handler(int sig) {
 	eventLoop_->postEvent(&stop_spectrum);
+}
 static void spectrum_sigterm_handler(int sig) {
-	eventLoop_->stop();
+	eventLoop_->postEvent(&stop_spectrum);
+}
 #ifndef WIN32
 static void daemonize(const char *cwd, const char *lock_file) {
 	pid_t pid, sid;
 	FILE* lock_file_f;
 	char process_pid[20];
 	/* already a daemon */
 	if ( getppid() == 1 ) return;
 	/* Fork off the parent process */
@@ @@ -227,58 +235,61 @@ int main(int argc, char **argv) @@
 			LOG4CXX_ERROR(logger, "Failed to set service.user name " << CONFIG_STRING(&config, "service.user") << " - " << pw->pw_uid << ":" << strerror(errno));
 			return 1;
+		}
+	}
 #endif
 	Swift::SimpleEventLoop eventLoop;
 	Swift::BoostNetworkFactories *factories = new Swift::BoostNetworkFactories(&eventLoop);
 	UserRegistry userRegistry(&config, factories);
 	Component transport(&eventLoop, factories, &config, NULL, &userRegistry);
 	component_ = &transport;
 // 	Logger logger(&transport);
 	StorageBackend *storageBackend = NULL;
 #ifdef WITH_SQLITE
 	if (CONFIG_STRING(&config, "database.type") == "sqlite3") {
 		storageBackend = new SQLite3Backend(&config);
 		if (!storageBackend->connect()) {
 			std::cerr << "Can't connect to database.\n";
 			return -1;
+		}
+	}
 #endif
 #ifdef WITH_MYSQL
 	if (CONFIG_STRING(&config, "database.type") == "mysql") {
 		storageBackend = new MySQLBackend(&config);
 		if (!storageBackend->connect()) {
 			std::cerr << "Can't connect to database.\n";
 			return -1;
+		}
+	}
 #endif
 	UserManager userManager(&transport, &userRegistry, storageBackend);
 	userManager_ = &userManager;
 	UserRegistration *userRegistration = NULL;
 	if (storageBackend) {
 		userRegistration = new UserRegistration(&transport, &userManager, storageBackend);
 		userRegistration->start();
 // 		logger.setUserRegistration(&userRegistration);
+	}
 // 	logger.setUserManager(&userManager);
 	NetworkPluginServer plugin(&transport, &config, &userManager);
 	AdminInterface adminInterface(&transport, &userManager, &plugin, storageBackend);
 	eventLoop_ = &eventLoop;
 	eventLoop.run();
 	if (userRegistration) {
 		userRegistration->stop();
 		delete userRegistration;
+	}
 	delete storageBackend;
 	delete factories;
+}

src/transport.cpp

➞

Show inline comments

@@ @@ -168,25 +168,26 @@ void Component::start() { @@
 		m_component->connect(CONFIG_STRING(m_config, "service.server"), CONFIG_INT(m_config, "service.port"));
 		m_reconnectTimer->stop();
+	}
 	else if (m_server) {
 		LOG4CXX_INFO(logger, "Starting component in server mode on port " << CONFIG_INT(m_config, "service.port"));
 		m_server->start();
+	}
+}
 void Component::stop() {
 	if (m_component) {
 		m_reconnectCount = 0;
 		m_component->disconnect();
 		// TODO: Call this once swiften will fix assert(!session_);
 // 		m_component->disconnect();
 		m_reconnectTimer->stop();
+	}
 	else if (m_server) {
 		LOG4CXX_INFO(logger, "Stopping component in server mode on port " << CONFIG_INT(m_config, "service.port"));
 		m_server->stop();
+	}
+}
 void Component::handleConnected() {
 	onConnected();
 	m_reconnectCount = 0;
+}

src/usermanager.cpp

➞

Show inline comments

@@ @@ -96,24 +96,30 @@ void UserManager::removeUser(User *user) { @@
 	if (m_component->inServerMode()) {
 		disconnectUser(user->getJID());
+	}
 	onUserDestroyed(user);
 	delete user;
 #ifndef WIN32
 	malloc_trim(0);
 #endif
 // 	VALGRIND_DO_LEAK_CHECK;
+}
 void UserManager::removeAllUsers() {
 	while(m_users.begin() != m_users.end()) {
 		removeUser((*m_users.begin()).second);
+	}
+}
 int UserManager::getUserCount() {
 	return m_users.size();
+}
 void UserManager::handlePresence(Swift::Presence::ref presence) {
 	std::string barejid = presence->getTo().toBare().toString();
 	std::string userkey = presence->getFrom().toBare().toString();
 	User *user = getUser(userkey);
 	// Create user class if it's not there
 	if (!user) {
 		// Admin user is not legacy network user, so do not create User class instance for him

0 comments (0 inline, 0 general)