[jboss-cvs] JBoss Messaging SVN: r5278 - in trunk: src/main/org/jboss/messaging/core/config and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 5 09:26:09 EST 2008
Author: jmesnil
Date: 2008-11-05 09:26:09 -0500 (Wed, 05 Nov 2008)
New Revision: 5278
Modified:
trunk/src/config/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java
Log:
JBMESSAGING-1187: Add param to enable message counters by default
added message-counter-enabled parameter to jbm-configuration.xml to enable/disable the message counter when the server is started (default is false)
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2008-11-05 12:54:32 UTC (rev 5277)
+++ trunk/src/config/jbm-configuration.xml 2008-11-05 14:26:09 UTC (rev 5278)
@@ -14,6 +14,9 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
+ <!-- by default, message counter is disabled -->
+ <message-counter-enabled>false</message-counter-enabled>
+
<!-- true to expose JBoss Messaging resources through JMX -->
<jmx-management-enabled>true</jmx-management-enabled>
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-11-05 12:54:32 UTC (rev 5277)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-11-05 14:26:09 UTC (rev 5278)
@@ -144,4 +144,6 @@
void setPagingMaxGlobalSizeBytes(long maxGlobalSize);
boolean isWildcardRoutingEnabled();
+
+ boolean isMessageCounterEnabled();
}
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-11-05 12:54:32 UTC (rev 5277)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-11-05 14:26:09 UTC (rev 5278)
@@ -75,6 +75,8 @@
public static final boolean DEFAULT_WILDCARD_ROUTING_ENABLED = false;
+ public static final boolean DEFAULT_MESSAGE_COUNTER_ENABLED = false;
+
// Attributes -----------------------------------------------------------------------------
protected boolean clustered = DEFAULT_CLUSTERED;
@@ -133,6 +135,8 @@
protected boolean wildcardRoutingEnabled = DEFAULT_WILDCARD_ROUTING_ENABLED;
+ protected boolean messageCounterEnabled = DEFAULT_MESSAGE_COUNTER_ENABLED;
+
public boolean isClustered()
{
return clustered;
@@ -387,6 +391,11 @@
{
pagingMaxGlobalSize = maxGlobalSize;
}
+
+ public boolean isMessageCounterEnabled()
+ {
+ return messageCounterEnabled;
+ }
@Override
public boolean equals(final Object other)
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-11-05 12:54:32 UTC (rev 5277)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-11-05 14:26:09 UTC (rev 5278)
@@ -349,8 +349,10 @@
journalMaxAIO = getInteger(e, "journal-max-aio", journalMaxAIO);
wildcardRoutingEnabled = getBoolean(e, "wild-card-routing-enabled", wildcardRoutingEnabled);
- }
+ messageCounterEnabled = getBoolean(e, "message-counter-enabled", messageCounterEnabled);
+}
+
public String getConfigurationUrl()
{
return configurationUrl;
Modified: trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java 2008-11-05 12:54:32 UTC (rev 5277)
+++ trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java 2008-11-05 14:26:09 UTC (rev 5278)
@@ -80,7 +80,7 @@
Configuration getConfiguration();
- boolean isEnableMessageCounters();
+ boolean isMessageCounterEnabled();
int getMessageCounterMaxDayCount();
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2008-11-05 12:54:32 UTC (rev 5277)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2008-11-05 14:26:09 UTC (rev 5278)
@@ -153,8 +153,8 @@
final MessagingServer messagingServer) throws Exception
{
this.postOffice = postOffice;
- this.securityRepository = securityRepository;
this.queueSettingsRepository = queueSettingsRepository;
+
managedServer = new MessagingServerControl(postOffice,
storageManager,
configuration,
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java 2008-11-05 12:54:32 UTC (rev 5277)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java 2008-11-05 14:26:09 UTC (rev 5278)
@@ -76,7 +76,7 @@
private final MessageCounterManager messageCounterManager;
private final NotificationBroadcasterSupport broadcaster;
- private boolean enableMessageCounters;
+ private boolean messageCounterEnabled;
// Static --------------------------------------------------------
@@ -96,6 +96,12 @@
this.server = messagingServer;
this.messageCounterManager = messageCounterManager;
this.broadcaster = broadcaster;
+
+ messageCounterEnabled = configuration.isMessageCounterEnabled();
+ if (messageCounterEnabled)
+ {
+ messageCounterManager.start();
+ }
}
// Public --------------------------------------------------------
@@ -398,12 +404,12 @@
public void enableMessageCounters()
{
- setEnableMessageCounters(true);
+ setMessageCounterEnabled(true);
}
public void disableMessageCounters()
{
- setEnableMessageCounters(false);
+ setMessageCounterEnabled(false);
}
public void resetAllMessageCounters()
@@ -416,9 +422,9 @@
messageCounterManager.resetAllCounterHistories();
}
- public boolean isEnableMessageCounters()
+ public boolean isMessageCounterEnabled()
{
- return enableMessageCounters;
+ return messageCounterEnabled;
}
public synchronized long getMessageCounterSamplePeriod()
@@ -493,20 +499,20 @@
// Private -------------------------------------------------------
- private synchronized void setEnableMessageCounters(boolean enable)
+ private synchronized void setMessageCounterEnabled(boolean enable)
{
if (isStarted())
{
- if (enableMessageCounters && !enable)
+ if (messageCounterEnabled && !enable)
{
stopMessageCounters();
}
- else if (!enableMessageCounters && enable)
+ else if (!messageCounterEnabled && enable)
{
startMessageCounters();
}
}
- enableMessageCounters = enable;
+ messageCounterEnabled = enable;
}
private void startMessageCounters()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java 2008-11-05 12:54:32 UTC (rev 5277)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java 2008-11-05 14:26:09 UTC (rev 5278)
@@ -84,6 +84,7 @@
PostOffice postOffice = createMock(PostOffice.class);
StorageManager storageManager = createMock(StorageManager.class);
Configuration configuration = createMock(Configuration.class);
+ expect(configuration.isMessageCounterEnabled()).andReturn(false);
HierarchicalRepository<Set<Role>> securityRepository = createMock(HierarchicalRepository.class);
HierarchicalRepository<QueueSettings> queueSettingsRepository = createMock(HierarchicalRepository.class);
MessagingServer messagingServer = createMock(MessagingServer.class);
@@ -111,6 +112,7 @@
PostOffice postOffice = createMock(PostOffice.class);
StorageManager storageManager = createMock(StorageManager.class);
Configuration configuration = createMock(Configuration.class);
+ expect(configuration.isMessageCounterEnabled()).andReturn(false);
HierarchicalRepository<Set<Role>> securityRepository = createMock(HierarchicalRepository.class);
HierarchicalRepository<QueueSettings> queueSettingsRepository = createMock(HierarchicalRepository.class);
MessagingServer messagingServer = createMock(MessagingServer.class);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java 2008-11-05 12:54:32 UTC (rev 5277)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java 2008-11-05 14:26:09 UTC (rev 5278)
@@ -496,6 +496,7 @@
postOffice = createMock(PostOffice.class);
storageManager = createMock(StorageManager.class);
configuration = createMock(Configuration.class);
+ expect(configuration.isMessageCounterEnabled()).andReturn(false);
securityRepository = createMock(HierarchicalRepository.class);
queueSettingsRepository = createMock(HierarchicalRepository.class);
server = createMock(MessagingServer.class);
More information about the jboss-cvs-commits
mailing list