diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-01-29 03:42:27 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-01-29 03:42:27 +0100 |
commit | a80034229b12d42b420a9b2cc10bf23f8c5f613b (patch) | |
tree | 812d3756ffb1dd74f014a07959c79fd2e651f943 /kamon-core/src/test/resources | |
parent | 1f873f6f28b92db54d97ce82c967866de41008d1 (diff) | |
parent | edceb598dd986c7a0b22f2f89e8dc9f8c0da19e8 (diff) | |
download | Kamon-a80034229b12d42b420a9b2cc10bf23f8c5f613b.tar.gz Kamon-a80034229b12d42b420a9b2cc10bf23f8c5f613b.tar.bz2 Kamon-a80034229b12d42b420a9b2cc10bf23f8c5f613b.zip |
Merge branch 'wip/improve-metric-recorders-infrastructure'
Conflicts:
kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsCollector.scala
Diffstat (limited to 'kamon-core/src/test/resources')
-rw-r--r-- | kamon-core/src/test/resources/logback.xml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kamon-core/src/test/resources/logback.xml b/kamon-core/src/test/resources/logback.xml index eb578346..dd623d61 100644 --- a/kamon-core/src/test/resources/logback.xml +++ b/kamon-core/src/test/resources/logback.xml @@ -1,17 +1,17 @@ <configuration scan="true"> + <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"> + <resetJUL>true</resetJUL> + </contextListener> - <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"> - <resetJUL>true</resetJUL> - </contextListener> + <conversionRule conversionWord="traceToken" converterClass="kamon.trace.logging.LogbackTraceTokenConverter"/> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%date{HH:mm:ss.SSS} %-5level [%X{uow}][%X{requestId}] [%thread] %logger{55} - %msg%n</pattern> - </encoder> - </appender> - - <root level="debug"> - <appender-ref ref="STDOUT" /> - </root> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%date{HH:mm:ss.SSS} %-5level [%traceToken][%thread] %logger{55} - %msg%n</pattern> + </encoder> + </appender> + <root level="error"> + <appender-ref ref="STDOUT"/> + </root> </configuration> |