From 8e48eec4485d1d1f69f47cc7996a3fdb483aecf7 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Mon, 27 Sep 2010 08:49:05 +0000
Subject: [PATCH] bug 1362: fixed log4cplus in Storage
---
RTCP/Storage/src/Storage.log_prop | 24 ++++++++++++++++--------
RTCP/Storage/src/Storage_main.cc | 13 ++-----------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/RTCP/Storage/src/Storage.log_prop b/RTCP/Storage/src/Storage.log_prop
index 5cdbc038174..1a616ec8e04 100644
--- a/RTCP/Storage/src/Storage.log_prop
+++ b/RTCP/Storage/src/Storage.log_prop
@@ -1,16 +1,24 @@
# Configure the loggers
-log4cplus.rootLogger=INFO, STDOUT
-#log4cplus.logger.TRC=INFO
+log4cplus.rootLogger=DEBUG, STDOUT
log4cplus.logger.TRC=INFO
-log4cplus.logger.LCS.Common=FATAL, STDOUT
+#log4cplus.logger.LCS.Common=FATAL, STDOUT
# Define the appenders
log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c{9} - %m [%.25l]%n
+log4cplus.appender.STDOUT.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %m%n
-log4cplus.appender.STDERR=log4cplus::ConsoleAppender
-log4cplus.appender.STDERR.layout=log4cplus::PatternLayout
-log4cplus.appender.STDERR.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-log4cplus.appender.STDERR.logToStdErr=true
+#log4cplus.appender.STDERR=log4cplus::ConsoleAppender
+#log4cplus.appender.STDERR.layout=log4cplus::PatternLayout
+#log4cplus.appender.STDERR.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
+#log4cplus.appender.STDERR.logToStdErr=true
+
+#log4cplus.appender.FILE=log4cplus::RollingFileAppender
+#log4cplus.appender.FILE.File=${LOG4CPLUS_LOGFILENAME}.log
+#log4cplus.appender.FILE.MaxFileSize=10MB
+#log4cplus.appender.FILE.MaxBackupIndex=2
+#log4cplus.appender.FILE.layout=log4cplus::PatternLayout
+#log4cplus.appender.FILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
+
+log4cplus.appender.DUMP=log4cplus::NullAppender
diff --git a/RTCP/Storage/src/Storage_main.cc b/RTCP/Storage/src/Storage_main.cc
index 9d995095537..2ed7e370841 100644
--- a/RTCP/Storage/src/Storage_main.cc
+++ b/RTCP/Storage/src/Storage_main.cc
@@ -147,18 +147,9 @@ int main(int argc, char *argv[])
string logPrefix = "[obs unknown] ";
#if defined HAVE_LOG4CPLUS
- using namespace log4cplus;
- using namespace log4cplus::helpers;
-
- helpers::Properties traceProp;
- traceProp.setProperty("log4cplus.rootLogger", "DEBUG, STDOUT");
- traceProp.setProperty("log4cplus.logger.TRC", "DEBUG");
- traceProp.setProperty("log4cplus.appender.STDOUT", "log4cplus::ConsoleAppender");
- traceProp.setProperty("log4cplus.appender.STDOUT.layout", "log4cplus::PatternLayout");
- traceProp.setProperty("log4cplus.appender.STDOUT.layout.ConversionPattern", "%x %D{%d-%m-%y %H:%M:%S} %-5p %n");
-
- PropertyConfigurator(traceProp).configure();
+ INIT_LOGGER( "Storage" );
#elif defined HAVE_LOG4CXX
+ #error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it
Context::initialize();
setLevel("Global",8);
#else
--
GitLab