From 20f9920d4704e28ee8aa066d151b522c0d14e166 Mon Sep 17 00:00:00 2001
From: Ivan Topolnak <ivantopo@gmail.com>
Date: Fri, 4 Oct 2013 16:12:29 -0300
Subject: Simplify logging instrumentation and integrate it with kamon-core,
 kamon-ouw is gone.

---
 kamon-core/src/main/resources/META-INF/aop.xml |  2 +-
 kamon-core/src/main/resources/application.conf |  2 +-
 kamon-core/src/main/resources/logback.xml      | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 kamon-core/src/main/resources/logback.xml

(limited to 'kamon-core/src/main/resources')

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>
-- 
cgit v1.2.3