From 7bd1ee1b36e401aaa64440bc6c3cc029c66365b1 Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Fri, 27 Feb 2009 16:57:22 +0000 Subject: QPID-1699: fix mbean annotation, log failure to reload file. Address review comments from robbie. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748591 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/configuration/ServerConfiguration.java | 10 +++++++--- .../configuration/management/ConfigurationManagement.java | 9 ++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'qpid/java/broker/src') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index cbb044b7e6..0cb31c1b14 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.management.NotCompliantMBeanException; - import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; @@ -39,6 +37,9 @@ import org.apache.qpid.server.configuration.management.ConfigurationManagementMB import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.virtualhost.VirtualHost; import org.apache.qpid.server.virtualhost.VirtualHostRegistry; +import org.apache.qpid.tools.messagestore.MessageStoreTool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import sun.misc.Signal; import sun.misc.SignalHandler; @@ -62,8 +63,11 @@ public class ServerConfiguration implements SignalHandler private SecurityConfiguration _securityConfiguration = null; private File _configFile; + + private Logger _log = LoggerFactory.getLogger(this.getClass()); private ConfigurationManagementMBean _mbean; + // Map of environment variables to config items private static final Map envVarMap = new HashMap(); @@ -206,7 +210,7 @@ public class ServerConfiguration implements SignalHandler } catch (ConfigurationException e) { - // Not much we can do about it really. + _log.error("Could not reload configuration file", e); } } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java index 161434bdea..8e4bf01c6a 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java @@ -20,8 +20,10 @@ */ package org.apache.qpid.server.configuration.management; +import javax.management.MBeanOperationInfo; + import org.apache.commons.configuration.ConfigurationException; -import org.apache.qpid.server.management.MBeanAttribute; +import org.apache.qpid.server.management.MBeanOperation; public interface ConfigurationManagement { @@ -33,8 +35,9 @@ public interface ConfigurationManagement * Reload the * @throws ConfigurationException */ - @MBeanAttribute(name="reloadSecurityConfiguration", - description = "Force a reload of the security configuration sections") + @MBeanOperation(name="reloadSecurityConfiguration", + description = "Force a reload of the security configuration sections", + impact = MBeanOperationInfo.ACTION) void reloadSecurityConfiguration() throws ConfigurationException; } -- cgit v1.2.1