diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp index bc191c89..dac4cb05 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(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 b5dc2ad8..fcdc906c 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 60f55c42..37a275f7 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 29949534..bc1b4213 100644 --- a/spectrum/src/main.cpp +++ b/spectrum/src/main.cpp @@ -20,9 +20,11 @@ #include #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 @@ -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(getpid())); + p.setProperty("jid", CONFIG_STRING(&config, "service.jid")); + log4cxx::PropertyConfigurator::configure(p); } #ifndef WIN32