diff options
| author | Ivan Topolnak <ivantopo@gmail.com> | 2013-10-04 16:12:29 -0300 |
|---|---|---|
| committer | Ivan Topolnak <ivantopo@gmail.com> | 2013-10-04 16:12:29 -0300 |
| commit | be683c67235e95daa6d980b91271ef06364f3567 (patch) | |
| tree | 152e0010e00846f241432a64b78d4ecee0370ecc /kamon-core/src/main/resources | |
| parent | d5fef9225bd89238844e97f3b461bb1a4ce19986 (diff) | |
| download | Kamon-be683c67235e95daa6d980b91271ef06364f3567.tar.gz Kamon-be683c67235e95daa6d980b91271ef06364f3567.tar.bz2 Kamon-be683c67235e95daa6d980b91271ef06364f3567.zip | |
Simplify logging instrumentation and integrate it with kamon-core, kamon-ouw is gone.
Diffstat (limited to 'kamon-core/src/main/resources')
| -rw-r--r-- | kamon-core/src/main/resources/META-INF/aop.xml | 2 | ||||
| -rw-r--r-- | kamon-core/src/main/resources/application.conf | 2 | ||||
| -rw-r--r-- | kamon-core/src/main/resources/logback.xml | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml index 104d7f78..349fc56d 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -14,7 +14,7 @@ <aspect name="kamon.instrumentation.SprayOpenRequestContextTracing"/> <aspect name = "kamon.instrumentation.SprayServerInstrumentation"/> <aspect name="kamon.instrumentation.ActorSystemInstrumentation"/> - + <aspect name="kamon.instrumentation.ActorLoggingInstrumentation"/> <!--<aspect name="kamon.instrumentation.MessageQueueInstrumentation" />--> <!--<aspect name="kamon.instrumentation.InceptionAspect"/>--> diff --git a/kamon-core/src/main/resources/application.conf b/kamon-core/src/main/resources/application.conf index 1b564f7e..57f67d32 100644 --- a/kamon-core/src/main/resources/application.conf +++ b/kamon-core/src/main/resources/application.conf @@ -4,7 +4,7 @@ akka { log-dead-letters = on #extensions = ["kamon.dashboard.DashboardExtension"] - akka.loggers = ["kamon.newrelic.NewRelicErrorLogger"] + loggers = ["kamon.newrelic.NewRelicErrorLogger", "akka.event.slf4j.Slf4jLogger"] actor { default-dispatcher { diff --git a/kamon-core/src/main/resources/logback.xml b/kamon-core/src/main/resources/logback.xml new file mode 100644 index 00000000..2ae1e3bd --- /dev/null +++ b/kamon-core/src/main/resources/logback.xml @@ -0,0 +1,12 @@ +<configuration scan="true"> + <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> + +</configuration> |