diff options
| author | Diego <diegolparra@gmail.com> | 2015-11-15 19:42:59 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2015-11-15 19:42:59 -0300 |
| commit | 159f43381b2f4fd3c8039af8cc7e3272e2f9d936 (patch) | |
| tree | f06391f9a7f3f1e6b207ded3c06f280294f07f51 /kamon-akka-remote/src/test | |
| parent | 539b54c3b43c68ad418ca77032f557a4da3e3a59 (diff) | |
| parent | ecf051478e80ba4ce6e7c8a169feefa771cc8e17 (diff) | |
| download | Kamon-159f43381b2f4fd3c8039af8cc7e3272e2f9d936.tar.gz Kamon-159f43381b2f4fd3c8039af8cc7e3272e2f9d936.tar.bz2 Kamon-159f43381b2f4fd3c8039af8cc7e3272e2f9d936.zip | |
wip: merge from master and fix some test
Diffstat (limited to 'kamon-akka-remote/src/test')
| -rw-r--r-- | kamon-akka-remote/src/test/resources/logback.xml | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/kamon-akka-remote/src/test/resources/logback.xml b/kamon-akka-remote/src/test/resources/logback.xml index dd623d61..b467456f 100644 --- a/kamon-akka-remote/src/test/resources/logback.xml +++ b/kamon-akka-remote/src/test/resources/logback.xml @@ -1,17 +1,12 @@ -<configuration scan="true"> - <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 |