Revert "Docker: log to stdout"

This reverts commit 1648d05c08459ec45391885985324f1c15a92dda.

4 files changed, 30 insertions, 14 deletions

diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh
index 80717830..3e1d4b63 100755
--- a/packaging/docker/run.sh
+++ b/packaging/docker/run.sh
@@ -15,3 +15,4 @@ echo "You should mount the directory with configuration files to /etc/spectrum2/
 echo "Check the http://spectrum.im/documentation for more information."
 spectrum2_manager start
 spectrum2_manager server &
+tail -f /var/log/spectrum2/*/* 2>/dev/null
diff --git a/tests/xmpp/configuration/backend-logging.cfg b/tests/xmpp/configuration/backend-logging.cfg
index 203ebc3d..1078afe2 100644
--- a/tests/xmpp/configuration/backend-logging.cfg
+++ b/tests/xmpp/configuration/backend-logging.cfg
@@ -1,7 +1,11 @@
-log4j.rootLogger=debug, stdout
+log4j.rootLogger=debug, R
 
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %-5p %c: %m%n
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=/var/log/spectrum2/${jid}/backends/backend-${id}.log
 
-log4j.category.Component.XML = ON
+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=${pid}: %d %-5p %c: %m%n
diff --git a/tests/xmpp/configuration/logging.cfg b/tests/xmpp/configuration/logging.cfg
index 203ebc3d..5ac8ee58 100644
--- a/tests/xmpp/configuration/logging.cfg
+++ b/tests/xmpp/configuration/logging.cfg
@@ -1,7 +1,14 @@
-log4j.rootLogger=debug, stdout
+log4j.rootLogger=debug, R
 
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %-5p %c: %m%n
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=/var/log/spectrum2/${jid}/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
+
+# Disable XML category
 log4j.category.Component.XML = ON
diff --git a/tests/xmpp/configuration/manager-logging.cfg b/tests/xmpp/configuration/manager-logging.cfg
index 203ebc3d..607a3d83 100644
--- a/tests/xmpp/configuration/manager-logging.cfg
+++ b/tests/xmpp/configuration/manager-logging.cfg
@@ -1,7 +1,11 @@
-log4j.rootLogger=debug, stdout
+log4j.rootLogger=debug, R
 
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %-5p %c: %m%n
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=/var/log/spectrum2/spectrum_manager.log
 
-log4j.category.Component.XML = ON
+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