JAMES-1894 Enhance ElasticSearch logs with logBack
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c6795567 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c6795567 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c6795567 Branch: refs/heads/master Commit: c67955672d9797e621a664d5577d4e47fb9cc441 Parents: ebb86c7 Author: Benoit Tellier <btell...@linagora.com> Authored: Thu Dec 22 11:57:12 2016 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Mon Jan 9 21:58:33 2017 +0700 ---------------------------------------------------------------------- mailbox/elasticsearch/pom.xml | 4 ++-- .../elasticsearch/query/SortConverter.java | 2 ++ .../src/test/resources/logback-test.xml | 25 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c6795567/mailbox/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml index 2621dd1..bfe0c5b 100644 --- a/mailbox/elasticsearch/pom.xml +++ b/mailbox/elasticsearch/pom.xml @@ -268,8 +268,8 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c6795567/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java index 737827e..2c80ecb 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java @@ -64,6 +64,8 @@ public class SortConverter { case DisplayTo: return SortBuilders.fieldSort(JsonMessageConstants.TO + PATH_SEPARATOR + JsonMessageConstants.EMailer.NAME + PATH_SEPARATOR + NodeMappingFactory.RAW) .setNestedPath(JsonMessageConstants.TO); + case Id: + return SortBuilders.fieldSort(JsonMessageConstants.ID); default: throw new RuntimeException("Sort is not implemented"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/c6795567/mailbox/elasticsearch/src/test/resources/logback-test.xml ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/resources/logback-test.xml b/mailbox/elasticsearch/src/test/resources/logback-test.xml new file mode 100644 index 0000000..8678b2f --- /dev/null +++ b/mailbox/elasticsearch/src/test/resources/logback-test.xml @@ -0,0 +1,25 @@ +<?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="ERROR"> + <appender-ref ref="CONSOLE" /> + </root> + + + <logger name="org.apache.james" level="DEBUG" > + <appender-ref ref="CONSOLE" /> + </logger> + + +</configuration> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
