QPID-4390: misc logging related changes

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1454938 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 24 insertions, 17 deletions

diff --git a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 8fa9a59038..903d322508 100644
--- a/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -320,20 +320,20 @@ public class HttpManagement extends AbstractPluginAdapter
     {
         if (keyStorePath == null)
         {
-            throw new RuntimeException("Management SSL keystore path not defined, unable to start SSL protected HTTP connector");
+            throw new RuntimeException("SSL keystore path not defined, unable to start HTTPS connector");
         }
         if (password == null)
         {
-            throw new RuntimeException("Management SSL keystore password, unable to start SSL protected HTTP connector");
+            throw new RuntimeException("SSL keystore password not defined, unable to start HTTPS connector");
         }
         File ksf = new File(keyStorePath);
         if (!ksf.exists())
         {
-            throw new RuntimeException("Cannot find management SSL keystore file: " + ksf);
+            throw new RuntimeException("Cannot find SSL keystore file for HTTPS management: " + ksf);
         }
         if (!ksf.canRead())
         {
-            throw new RuntimeException("Cannot read management SSL keystore file: " + ksf + ". Check permissions.");
+            throw new RuntimeException("Cannot read SSL keystore file for HTTPS management: " + ksf + ". Check permissions.");
         }
     }
 
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
index a045683de1..93f7df8c85 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
+++ b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
@@ -278,11 +278,11 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
         File ksf = new File(keyStorePath);
         if (!ksf.exists())
         {
-            throw new FileNotFoundException("Cannot find JMX management SSL keystore file: " + ksf);
+            throw new FileNotFoundException("Cannot find SSL keystore file for JMX management: " + ksf);
         }
         if (!ksf.canRead())
         {
-            throw new FileNotFoundException("Cannot read JMX management SSL keystore file: "
+            throw new FileNotFoundException("Cannot read SSL keystore file for JMX management: "
                                             + ksf +  ". Check permissions.");
         }
     }
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
index f53b369221..d725dc4dc3 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
+++ b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
@@ -168,9 +168,16 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
             {
                 if(!_children.containsKey(virtualHost))
                 {
-                    LOGGER.debug("Create MBean for virtual host:" + virtualHost.getName());
+                    if(LOGGER.isDebugEnabled())
+                    {
+                        LOGGER.debug("Create MBean for virtual host:" + virtualHost.getName());
+                    }
                     VirtualHostMBean mbean = new VirtualHostMBean(virtualHost, _objectRegistry);
-                    LOGGER.debug("Check for additional MBeans for virtual host:" + virtualHost.getName());
+
+                    if(LOGGER.isDebugEnabled())
+                    {
+                        LOGGER.debug("Check for additional MBeans for virtual host:" + virtualHost.getName());
+                    }
                     createAdditionalMBeansFromProviders(virtualHost, mbean);
                 }
             }
@@ -312,10 +319,17 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
         QpidServiceLoader<MBeanProvider> qpidServiceLoader = new QpidServiceLoader<MBeanProvider>();
         for (MBeanProvider provider : qpidServiceLoader.instancesOf(MBeanProvider.class))
         {
-            LOGGER.debug("Consulting mbean provider : " + provider + " for child : " + child);
+            if(LOGGER.isDebugEnabled())
+            {
+                LOGGER.debug("Consulting mbean provider : " + provider + " for child : " + child);
+            }
+
             if (provider.isChildManageableByMBean(child))
             {
-                LOGGER.debug("Provider will create mbean ");
+                if(LOGGER.isDebugEnabled())
+                {
+                    LOGGER.debug("Provider will create mbean");
+                }
                 provider.createMBean(child, mbean);
                 // TODO track the mbeans that have been created on behalf of a child in a map, then
                 // if the child is ever removed, destroy these beans too.
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
index c2186c372b..99ef205a58 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
+++ b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
@@ -21,15 +21,12 @@ package org.apache.qpid.server.jmx;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.Plugin;
 import org.apache.qpid.server.plugin.PluginFactory;
 
 public class JMXManagementFactory implements PluginFactory
 {
-    private static final Logger LOGGER = Logger.getLogger(JMXManagementFactory.class);
-
     @Override
     public Plugin createInstance(UUID id, Map<String, Object> attributes, Broker broker)
     {
@@ -39,10 +36,6 @@ public class JMXManagementFactory implements PluginFactory
         }
         else
         {
-            if (LOGGER.isDebugEnabled())
-            {
-                LOGGER.debug("Skipping registration of JMX plugin as JMX Management disabled in config.");
-            }
             return null;
         }
     }