From 803c590d4632c695c47c0c2838e06a8425c6960e 2011-10-05 09:28:25
From: HanzZ <hanzz.k@gmail.com>
Date: 2011-10-05 09:28:25
Subject: [PATCH] Added  variable to log4cxx configs

---

diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp
index bc191c89f8de7fc1c3bc1373833aaaa5682849df..dac4cb058f09c1e7d7ff776367eec08193aeb416 100644
--- a/backends/libpurple/main.cpp
+++ b/backends/libpurple/main.cpp
@@ -1706,6 +1706,7 @@ int main(int argc, char **argv) {
 
 			p.load(istream);
 			p.setProperty("pid", boost::lexical_cast<std::string>(getpid()));
+			p.setProperty("jid", CONFIG_STRING(&config, "service.jid"));
 			log4cxx::PropertyConfigurator::configure(p);
 		}
 
diff --git a/spectrum/src/backend-logging.cfg b/spectrum/src/backend-logging.cfg
index b5dc2ad80b2cde7eb41c3ae88d73ecbfe2a70127..fcdc906c8bd15387ebe6d4ff7d97cd98c2374b18 100644
--- a/spectrum/src/backend-logging.cfg
+++ b/spectrum/src/backend-logging.cfg
@@ -1,7 +1,7 @@
 log4j.rootLogger=debug, R
 
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=/var/log/spectrum2/backends/backend-${pid}.log
+log4j.appender.R.File=/var/log/spectrum2/${jid}/backends/backend-${pid}.log
 
 log4j.appender.R.MaxFileSize=10000KB
 # Keep one backup file
diff --git a/spectrum/src/logging.cfg b/spectrum/src/logging.cfg
index 60f55c4235ce885eb3c6fa20f3ae799b2af1a784..37a275f78904ff39e68c031059f092bca77db3de 100644
--- a/spectrum/src/logging.cfg
+++ b/spectrum/src/logging.cfg
@@ -1,7 +1,7 @@
 log4j.rootLogger=debug, R
 
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=/var/log/spectrum2/spectrum2.log
+log4j.appender.R.File=/var/log/spectrum2/${jid}/spectrum2.log
 
 log4j.appender.R.MaxFileSize=10000KB
 # Keep one backup file
diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
index 299495346d965fbe6e8d7718daa4ad2fb426f1a5..bc1b42136daa7a829534fa6f068961082177a833 100644
--- a/spectrum/src/main.cpp
+++ b/spectrum/src/main.cpp
@@ -20,9 +20,11 @@
 #include <tchar.h>
 #endif
 #include "log4cxx/logger.h"
+#include "log4cxx/consoleappender.h"
 #include "log4cxx/patternlayout.h"
 #include "log4cxx/propertyconfigurator.h"
-#include "log4cxx/consoleappender.h"
+#include "log4cxx/helpers/properties.h"
+#include "log4cxx/helpers/fileinputstream.h"
 #include "libgen.h"
 #include <sys/stat.h>
 
@@ -218,7 +220,13 @@ int main(int argc, char **argv)
 #endif
 	}
 	else {
-		log4cxx::PropertyConfigurator::configure(CONFIG_STRING(&config, "logging.config"));
+		log4cxx::helpers::Properties p;
+		log4cxx::helpers::FileInputStream *istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(&config, "logging.config"));
+
+		p.load(istream);
+		p.setProperty("pid", boost::lexical_cast<std::string>(getpid()));
+		p.setProperty("jid", CONFIG_STRING(&config, "service.jid"));
+		log4cxx::PropertyConfigurator::configure(p);
 	}
 
 #ifndef WIN32