You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2016/05/20 13:47:11 UTC
[1/3] james-project git commit: JAMES-1739 bundle a default logback
configuration
Repository: james-project
Updated Branches:
refs/heads/master 04b8c3e2b -> ab37c84f0
JAMES-1739 bundle a default logback configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8d7c8ede
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8d7c8ede
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8d7c8ede
Branch: refs/heads/master
Commit: 8d7c8ede700225e2b0ce04d3237350af1d1ae79f
Parents: 5a76eee
Author: Matthieu Baechler <ma...@linagora.com>
Authored: Wed May 18 17:00:11 2016 +0200
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Wed May 18 17:00:11 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/logback.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8d7c8ede/server/container/guice/cassandra-guice/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/resources/logback.xml b/server/container/guice/cassandra-guice/src/main/resources/logback.xml
new file mode 100644
index 0000000..f2c08d8
--- /dev/null
+++ b/server/container/guice/cassandra-guice/src/main/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
+ <immediateFlush>false</immediateFlush>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="CONSOLE" />
+ </root>
+
+</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/3] james-project git commit: JAMES-1739 allow override of logback
configuration from conf
Posted by ad...@apache.org.
JAMES-1739 allow override of logback configuration from conf
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/583d132e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/583d132e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/583d132e
Branch: refs/heads/master
Commit: 583d132e8f57932514eeb9666152d9824e47b870
Parents: 8d7c8ed
Author: Matthieu Baechler <ma...@linagora.com>
Authored: Wed May 18 17:16:17 2016 +0200
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Wed May 18 17:16:17 2016 +0200
----------------------------------------------------------------------
dockerfiles/run/guice/Dockerfile | 2 +-
.../run/guice/destination/conf/logback.xml | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/583d132e/dockerfiles/run/guice/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/Dockerfile b/dockerfiles/run/guice/Dockerfile
index cd03111..e2176ce 100644
--- a/dockerfiles/run/guice/Dockerfile
+++ b/dockerfiles/run/guice/Dockerfile
@@ -24,4 +24,4 @@ ADD destination/james-server-cli-3.0.0-beta5-SNAPSHOT.jar /root/james-cli.jar
ADD destination/james-server-cli-3.0.0-beta5-SNAPSHOT.lib /root/james-server-cli-3.0.0-beta5-SNAPSHOT.lib
ADD destination/conf /root/conf
-ENTRYPOINT java -Dworking.directory=/root/ -jar james-server.jar
+ENTRYPOINT java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ -jar james-server.jar
http://git-wip-us.apache.org/repos/asf/james-project/blob/583d132e/dockerfiles/run/guice/destination/conf/logback.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/destination/conf/logback.xml b/dockerfiles/run/guice/destination/conf/logback.xml
new file mode 100644
index 0000000..f2c08d8
--- /dev/null
+++ b/dockerfiles/run/guice/destination/conf/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
+ <immediateFlush>false</immediateFlush>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="CONSOLE" />
+ </root>
+
+</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/3] james-project git commit: Merge remote-tracking branch
'mbaechler/JAMES-1739'
Posted by ad...@apache.org.
Merge remote-tracking branch 'mbaechler/JAMES-1739'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ab37c84f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ab37c84f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ab37c84f
Branch: refs/heads/master
Commit: ab37c84f03f37f9d8ea3cd1ee16067f14aa1d27f
Parents: 04b8c3e 583d132
Author: Antoine Duprat <an...@gmail.com>
Authored: Fri May 20 15:46:17 2016 +0200
Committer: Antoine Duprat <an...@gmail.com>
Committed: Fri May 20 15:46:17 2016 +0200
----------------------------------------------------------------------
dockerfiles/run/guice/Dockerfile | 2 +-
.../run/guice/destination/conf/logback.xml | 19 +++++++++++++++++++
.../src/main/resources/logback.xml | 19 +++++++++++++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org