libtransport.git Changeset - 7d238f4440b7

Changeset - 7d238f4440b7

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 13 years ago 2012-03-21 11:01:07
hanzz.k@gmail.com

catch FileInputStream exception

3 files changed with 35 insertions and 4 deletions:

backends/libpurple/main.cpp

plugin/cpp/CMakeLists.txt

src/logging.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -1655,13 +1655,27 @@ int main(int argc, char **argv) { @@
 #else
 			root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));
 #endif
+		}
 		else {
 			log4cxx::helpers::Properties p;
 			log4cxx::helpers::FileInputStream *istream = new log4cxx::helpers::FileInputStream(KEYFILE_STRING("logging", "backend_config"));
 			log4cxx::helpers::FileInputStream *istream = NULL;
 			try {
 				istream = new log4cxx::helpers::FileInputStream(KEYFILE_STRING("logging", "backend_config"));
+			}
 			catch(log4cxx::helpers::IOException &ex) {
 				std::cerr << "Can't create FileInputStream logger instance: " << ex.what() << "\n";
+			}
 			catch (...) {
 				std::cerr << "Can't create FileInputStream logger instance\n";
+			}
 			if (!istream) {
 				return 1;
+			}
 			p.load(istream);
 			LogString pid, jid;
 			log4cxx::helpers::Transcoder::decode(stringOf(getpid()), pid);
 			log4cxx::helpers::Transcoder::decode(KEYFILE_STRING("service", "jid"), jid);
 #ifdef _MSC_VER
 			p.setProperty(L"pid", pid);

plugin/cpp/CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB HEADERS ../include/transport/*.h)
 set(EXTRA_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../../src/memoryusage.cpp)
 set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.pb.cc)
 if (NOT WIN32)
-	ADD_LIBRARY(transport-plugin SHARED ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS} ../../src/memoryusage.cpp ${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.pb.cc)
+	ADD_LIBRARY(transport-plugin SHARED ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS} ${EXTRA_SOURCES})
 else()
-	ADD_LIBRARY(transport-plugin STATIC ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS} ../../src/memoryusage.cpp ${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.pb.cc)
+	ADD_LIBRARY(transport-plugin STATIC ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS} ${EXTRA_SOURCES})
 endif()
 ADD_DEPENDENCIES(transport-plugin pb)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
 if (CMAKE_COMPILER_IS_GNUCXX)
 	ADD_DEFINITIONS(-fPIC)

src/logging.cpp

➞

Show inline comments

@@ @@ -64,13 +64,27 @@ static void initLogging(Config *config, std::string key) { @@
 #else
 		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
 #endif
+	}
 	else {
 		log4cxx::helpers::Properties p;
 		log4cxx::helpers::FileInputStream *istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key));
 		log4cxx::helpers::FileInputStream *istream = NULL;
 		try {
 			istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key));
+		}
 		catch(log4cxx::helpers::IOException &ex) {
 			std::cerr << "Can't create FileInputStream logger instance: " << ex.what() << "\n";
+		}
 		catch (...) {
 			std::cerr << "Can't create FileInputStream logger instance\n";
+		}
 		if (!istream) {
 			return;
+		}
 		p.load(istream);
 		LogString pid, jid;
 		log4cxx::helpers::Transcoder::decode(boost::lexical_cast<std::string>(getpid()), pid);
 		log4cxx::helpers::Transcoder::decode(CONFIG_STRING(config, "service.jid"), jid);
 #ifdef WIN32

0 comments (0 inline, 0 general)