From a146ffb30e61f40bcaaeb83c6af06fac4ab32cc2 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Sat, 31 Dec 2016 15:28:06 +0100
Subject: [PATCH] Minor changes to distribution's log4j config file to include
 the messagelog logger

---
 broker/src/test/resources/log4j.properties         |  1 -
 distribution/src/main/resources/log4j.properties   | 14 ++++++++++++++
 .../io/moquette/test/osgi/MoquetteOsgiTest.java    |  7 ++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/broker/src/test/resources/log4j.properties b/broker/src/test/resources/log4j.properties
index 1de48f19..e923dd42 100644
--- a/broker/src/test/resources/log4j.properties
+++ b/broker/src/test/resources/log4j.properties
@@ -53,4 +53,3 @@ log4j.appender.messagelog.layout=org.apache.log4j.PatternLayout
 log4j.appender.messagelog.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c{1} %L %x - %m%n
 
 log4j.category.messageLogger=WARN, messagelog
-#log4j.additivity.messageLogger=false
diff --git a/distribution/src/main/resources/log4j.properties b/distribution/src/main/resources/log4j.properties
index 1e8e9410..4b9ec64f 100644
--- a/distribution/src/main/resources/log4j.properties
+++ b/distribution/src/main/resources/log4j.properties
@@ -31,3 +31,17 @@ log4j.appender.file.MaxFileSize=1MB
 log4j.appender.file.MaxBackupIndex=1
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n
+
+
+####################################
+#   Message Logger Configuration   #
+#####################################
+log4j.appender.messagelog=org.apache.log4j.RollingFileAppender
+log4j.appender.messagelog.Threshold=WARN
+log4j.appender.messagelog.File=moquette_messages.log
+log4j.appender.messagelog.MaxFileSize=100MB
+log4j.appender.messagelog.MaxBackupIndex=1
+log4j.appender.messagelog.layout=org.apache.log4j.PatternLayout
+log4j.appender.messagelog.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c{1} %L %x - %m%n
+
+log4j.category.messageLogger=WARN, messagelog
\ No newline at end of file
diff --git a/osgi_test/src/test/java/io/moquette/test/osgi/MoquetteOsgiTest.java b/osgi_test/src/test/java/io/moquette/test/osgi/MoquetteOsgiTest.java
index 5616e8b1..c3e618bf 100644
--- a/osgi_test/src/test/java/io/moquette/test/osgi/MoquetteOsgiTest.java
+++ b/osgi_test/src/test/java/io/moquette/test/osgi/MoquetteOsgiTest.java
@@ -57,13 +57,14 @@ public class MoquetteOsgiTest {
     @Test
     public void testCanFindOsgiBundle() throws Exception {
         for (Bundle b : bundleContext.getBundles()) {
-	System.out.format("%s %d\n", b.getSymbolicName(), b.getState());
-            if (b.getSymbolicName().indexOf("moquette") != -1) {
+            String symbolicName = b.getSymbolicName();
+            System.out.format("%s %d\n", symbolicName, b.getState());
+            if (symbolicName != null && symbolicName.indexOf("moquette") != -1) {
                 return;
             }
         }
 
         // If found no bundles with moquette in the name, fail the test.
-	fail();
+	    fail();
     }
 }