libtransport.git Changeset - 18d3aa4b00e9

Changeset - 18d3aa4b00e9

Parent rev.

Child rev.

[Not reviewed]

0 2 2

Jan Kaluza - 14 years ago 2011-06-21 15:28:25
hanzz.k@gmail.com

logging.cfg and backend_logging.cfg

4 files changed with 30 insertions and 2 deletions:

backends/libpurple/main.cpp

spectrum/src/backend-logging.cfg

spectrum/src/logging.cfg

spectrum/src/sample.cfg

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -10,24 +10,26 @@ @@
 #include "transport/userregistration.h"
 #include "transport/user.h"
 #include "transport/storagebackend.h"
 #include "transport/rostermanager.h"
 #include "transport/conversation.h"
 #include "transport/networkplugin.h"
 #include "spectrumeventloop.h"
 #include "geventloop.h"
 #include "log4cxx/logger.h"
 #include "log4cxx/consoleappender.h"
 #include "log4cxx/patternlayout.h"
 #include "log4cxx/propertyconfigurator.h"
 #include "log4cxx/helpers/properties.h"
 #include "log4cxx/helpers/fileinputstream.h"
 using namespace log4cxx;
 static LoggerPtr logger_libpurple = Logger::getLogger("backend.libpurple");
 static LoggerPtr logger = Logger::getLogger("backend");
 using namespace Transport;
 class SpectrumNetworkPlugin;
 SpectrumNetworkPlugin *np;
@@ @@ -1028,24 +1030,29 @@ int main(int argc, char **argv) { @@
 #endif
 		Config config;
 		if (!config.load(argv[1])) {
 			std::cout << "Can't open " << argv[1] << " configuration file.\n";
 			return 1;
+		}
 		if (CONFIG_STRING(&config, "logging.backend_config").empty()) {
 			LoggerPtr root = log4cxx::Logger::getRootLogger();
 			root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
+		}
 		else {
 			log4cxx::PropertyConfigurator::configure(CONFIG_STRING(&config, "logging.backend_config"));
 			log4cxx::helpers::Properties p;
 			log4cxx::helpers::FileInputStream *istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(&config, "logging.backend_config"));
 			p.load(istream);
 			p.setProperty("pid", boost::lexical_cast<std::string>(getpid()));
 			log4cxx::PropertyConfigurator::configure(p);
+		}
 		initPurple(config);
 		SpectrumEventLoop eventLoop;
 		np = new SpectrumNetworkPlugin(&config, &eventLoop, host, port);
 		eventLoop.run();
+	}
 	g_option_context_free(context);
+}

spectrum/src/backend-logging.cfg

➞

Show inline comments

@@ new file 100644 @@
 log4j.rootLogger=debug, R
 log4j.appender.R=org.apache.log4j.RollingFileAppender
 log4j.appender.R.File=backend-${pid}.log
 log4j.appender.R.MaxFileSize=10000KB
 # Keep one backup file
 log4j.appender.R.MaxBackupIndex=1
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
 log4j.appender.R.layout.ConversionPattern=%d %-5p %c: %m%n

spectrum/src/logging.cfg

➞

Show inline comments

@@ new file 100644 @@
 log4j.rootLogger=debug, R
 log4j.appender.R=org.apache.log4j.RollingFileAppender
 log4j.appender.R.File=spectrum2.log
 log4j.appender.R.MaxFileSize=10000KB
 # Keep one backup file
 log4j.appender.R.MaxBackupIndex=1
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
 log4j.appender.R.layout.ConversionPattern=%d %-5p %c: %m%n

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -9,18 +9,17 @@ backend_port=10001 @@
 #cert= #patch to PKCS#12 certificate
 #cert_password= #password to that certificate if any
 users_per_backend=2
 backend=../../backends/libpurple/spectrum_libpurple_backend
 #backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=prpl-icq
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends
 #config=test.cfg
 [database]
 type = sqlite3 # or "none" without database backend
 database = test.sql
 prefix=icq

0 comments (0 inline, 0 general)