From 18d3aa4b00e9c806b4040810a03b4560ccd7e4e8 2011-06-21 15:28:25
From: Jan Kaluza <hanzz.k@gmail.com>
Date: 2011-06-21 15:28:25
Subject: [PATCH] logging.cfg and backend_logging.cfg

---

diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp
index 903966800f79085bfcbe05504ed7d0e509daea46..a1bcd78834a8529192f47c81fe8db24c45962348 100644
--- a/backends/libpurple/main.cpp
+++ b/backends/libpurple/main.cpp
@@ -19,6 +19,8 @@
 #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;
 
@@ -1037,7 +1039,12 @@ int main(int argc, char **argv) {
 			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);
diff --git a/spectrum/src/backend-logging.cfg b/spectrum/src/backend-logging.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..ab7995e9b6a84b30d0b054a7af513c16edfd6253
--- /dev/null
+++ b/spectrum/src/backend-logging.cfg
@@ -0,0 +1,11 @@
+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
diff --git a/spectrum/src/logging.cfg b/spectrum/src/logging.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..09cf82a62f23e896ff9340b17c96021f27848663
--- /dev/null
+++ b/spectrum/src/logging.cfg
@@ -0,0 +1,11 @@
+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
diff --git a/spectrum/src/sample.cfg b/spectrum/src/sample.cfg
index c245ae914d666ecd66045147c0f42817c5aed364..e0a83efae465a162d3aa47f68444a1fce783963a 100644
--- a/spectrum/src/sample.cfg
+++ b/spectrum/src/sample.cfg
@@ -18,7 +18,6 @@ protocol=prpl-jabber
 [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