aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/test
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2015-11-15 19:42:59 -0300
committerDiego <diegolparra@gmail.com>2015-11-15 19:42:59 -0300
commitf671c21df6faf74de9cc19dca00f5a4e07218ea7 (patch)
tree502e9e2ae735bf8892750564cb0190adb0fed303 /kamon-core/src/test
parentec91eede73e20fef3b694fa45009ddd0ef0b345b (diff)
parenta805a84f5bb6fd1ee1997ee2f19caa53fd4cffe9 (diff)
downloadKamon-f671c21df6faf74de9cc19dca00f5a4e07218ea7.tar.gz
Kamon-f671c21df6faf74de9cc19dca00f5a4e07218ea7.tar.bz2
Kamon-f671c21df6faf74de9cc19dca00f5a4e07218ea7.zip
wip: merge from master and fix some test
Diffstat (limited to 'kamon-core/src/test')
-rw-r--r--kamon-core/src/test/resources/logback.xml16
1 files changed, 5 insertions, 11 deletions
diff --git a/kamon-core/src/test/resources/logback.xml b/kamon-core/src/test/resources/logback.xml
index 7bb50450..b467456f 100644
--- a/kamon-core/src/test/resources/logback.xml
+++ b/kamon-core/src/test/resources/logback.xml
@@ -1,18 +1,12 @@
-<configuration
- >
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <conversionRule conversionWord="traceToken" converterClass="kamon.trace.logging.LogbackTraceTokenConverter"/>
-
+<configuration>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%date{HH:mm:ss.SSS} %-5level [%traceToken][%thread] %logger{55} - %msg%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
- <root level="error">
+ <root level="OFF">
<appender-ref ref="STDOUT"/>
</root>
-</configuration>
+</configuration> \ No newline at end of file