libtransport.git Changeset - a330a1580744

Changeset - a330a1580744

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 13 years ago 2012-04-14 09:14:52
hanzz.k@gmail.com

Shutdown logging before exit() call to fix potential freeze

3 files changed with 14 insertions and 0 deletions:

backends/skype/main.cpp

include/transport/logging.h

src/logging.cpp

0 comments (0 inline, 0 general)

backends/skype/main.cpp

➞

Show inline comments

@@ @@ -162,12 +162,13 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 		void handleLogoutRequest(const std::string &user, const std::string &legacyName) {
 			Skype *skype = m_sessions[user];
 			if (skype) {
 				LOG4CXX_INFO(logger, "User wants to logout, logging out");
 				skype->logout();
 				Logging::shutdownLogging();
 				exit(1);
+			}
+		}
 		void handleStatusChangeRequest(const std::string &user, int status, const std::string &statusMessage) {
 			Skype *skype = m_sessions[user];
@@ @@ -798,12 +799,13 @@ static int create_socket(char *host, int portno) { @@
 	serv_addr.sin_port = htons(portno);
 	hostent *hos;  // Resolve name
 	if ((hos = gethostbyname(host)) == NULL) {
 		// strerror() will not work for gethostbyname() and hstrerror()
 		// is supposedly obsolete
 		Logging::shutdownLogging();
 		exit(1);
+	}
 	serv_addr.sin_addr.s_addr = *((unsigned long *) hos->h_addr_list[0]);
 	if (connect(m_sock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
 		close(m_sock);
@@ @@ -820,20 +822,22 @@ static int create_socket(char *host, int portno) { @@
 static gboolean transportDataReceived(GIOChannel *source, GIOCondition condition, gpointer data) {
 	char buffer[65535];
 	char *ptr = buffer;
 	ssize_t n = read(m_sock, ptr, sizeof(buffer));
 	if (n <= 0) {
 		LOG4CXX_INFO(logger, "Diconnecting from spectrum2 server");
 		Logging::shutdownLogging();
 		exit(errno);
+	}
 	std::string d = std::string(buffer, n);
 	np->handleDataRead(d);
 	return TRUE;
+}
 static void io_destroy(gpointer data) {
 	Logging::shutdownLogging();
 	exit(1);
+}
 static void log_glib_error(const gchar *string) {
 	LOG4CXX_ERROR(logger, "GLIB ERROR:" << string);
+}

include/transport/logging.h

➞

Show inline comments

@@ @@ -32,12 +32,13 @@ @@
 #include "log4cxx/patternlayout.h"
 #include "log4cxx/propertyconfigurator.h"
 #include "log4cxx/helpers/properties.h"
 #include "log4cxx/helpers/fileinputstream.h"
 #include "log4cxx/helpers/transcoder.h"
 #include "log4cxx/logger.h"
 #include "log4cxx/logmanager.h"
 #define DEFINE_LOGGER(VAR, NAME) static log4cxx::LoggerPtr VAR = log4cxx::Logger::getLogger(NAME);
 using namespace log4cxx;
 #else
 #define DEFINE_LOGGER(VARIABLE, NAME) static const char *VARIABLE = NAME;
@@ @@ -52,10 +53,11 @@ namespace Transport { @@
 class Config;
 namespace Logging {
 void initBackendLogging(Config *config);
 void initMainLogging(Config *config);
 void shutdownLogging();
+}
+}

src/logging.cpp

➞

Show inline comments

@@ @@ -136,17 +136,25 @@ void initBackendLogging(Config *config) { @@
+}
 void initMainLogging(Config *config) {
 	initLogging(config, "logging.config");
+}
 void shutdownLogging() {
 	log4cxx::LogManager::shutdown();
+}
 #else /* WITH_LOG4CXX */
 void initBackendLogging(Config */*config*/) {
+}
 void initMainLogging(Config */*config*/) {
+}
 void shutdownLogging() {
+}
 #endif /* WITH_LOG4CXX */
+}
+}

0 comments (0 inline, 0 general)