Merge pull request #2758 from corda/merge/CORDA-1155

CORDA-1155 - Jolokia logging via slf4j (#2753)

config/dev/log4j2.xml

@@ -60,5 +60,9 @@
         <Logger name="org.apache.activemq.artemis.core.server" level="error" additivity="false">
             <AppenderRef ref="RollingFile-Appender"/>
         </Logger>
+        <Logger name="org.jolokia" additivity="true" level="warn">
+            <AppenderRef ref="Console-Appender-Println"/>
+            <AppenderRef ref="RollingFile-Appender" />
+        </Logger>
     </Loggers>
 </Configuration>

node/build.gradle

@@ -175,7 +175,8 @@ dependencies {
     testCompile "org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey_version}"
     testCompile "org.glassfish.jersey.containers:jersey-container-jetty-http:${jersey_version}"
 
-    runtime "org.jolokia:jolokia-jvm:${jolokia_version}:agent"
+    // Jolokia JVM monitoring agent, required to push logs through slf4j
+    compile "org.jolokia:jolokia-jvm:${jolokia_version}:agent"
 }
 
 task integrationTest(type: Test) {

node/src/main/kotlin/net/corda/node/JolokiaSlf4jAdapter.kt

@@ -0,0 +1,35 @@
+package net.corda.node
+
+import org.jolokia.util.LogHandler
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+class JolokiaSlf4jAdapter : LogHandler {
+    companion object {
+        val log: Logger = LoggerFactory.getLogger("org.jolokia")
+    }
+
+    override fun error(message: String?, t: Throwable?) {
+        if (message != null) {
+            if (t != null) {
+                log.error(message, t)
+            } else {
+                log.error(message)
+            }
+        } else if (t != null) {
+            log.error("Exception without a comment", t)
+        }
+    }
+
+    override fun debug(message: String?) {
+        if (message != null) {
+            log.debug(message)
+        }
+    }
+
+    override fun info(message: String?) {
+        if (message != null) {
+            log.info(message)
+        }
+    }
+}

testing/test-common/src/main/resources/log4j2-test.xml

@@ -25,5 +25,8 @@
         <Logger name="org.hibernate.SQL" level="info" additivity="false">

             <AppenderRef ref="Console-Appender"/>

         </Logger>
+        <Logger name="org.jolokia" additivity="true" level="warn">
+            <AppenderRef ref="Console-Appender-Println"/>
+        </Logger>
     </Loggers>
 </Configuration>