diff options
Diffstat (limited to 'java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java')
-rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java index 90dc7432b2..8b764efa42 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java +++ b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java @@ -71,8 +71,8 @@ public class VirtualHost implements Accessable private ACLPlugin _accessManager; - private Timer _houseKeepingTimer; - + private final Timer _houseKeepingTimer = new Timer("Queue-housekeeping", true); + private static final long DEFAULT_HOUSEKEEPING_PERIOD = 30000L; public void setAccessableName(String name) @@ -172,25 +172,22 @@ public class VirtualHost implements Accessable _brokerMBean = new AMQBrokerManagerMBean(_virtualHostMBean); _brokerMBean.register(); - - _houseKeepingTimer = new Timer("Queue-housekeeping-" + _name, true); - initialiseHouseKeeping(hostConfig); } private void initialiseHouseKeeping(final Configuration hostConfig) { - + long period = hostConfig.getLong("housekeeping.expiredMessageCheckPeriod", DEFAULT_HOUSEKEEPING_PERIOD); - + /* add a timer task to iterate over queues, cleaning expired messages from queues with no consumers */ - if (period != 0L) + if(period != 0L) { class RemoveExpiredMessagesTask extends TimerTask { public void run() { - for (AMQQueue q : _queueRegistry.getQueues()) + for(AMQQueue q : _queueRegistry.getQueues()) { try @@ -199,7 +196,7 @@ public class VirtualHost implements Accessable } catch (AMQException e) { - _logger.error("Exception in housekeeping for queue: " + q.getName().toString(), e); + _logger.error("Exception in housekeeping for queue: " + q.getName().toString(),e); throw new RuntimeException(e); } } @@ -207,11 +204,11 @@ public class VirtualHost implements Accessable } _houseKeepingTimer.scheduleAtFixedRate(new RemoveExpiredMessagesTask(), - period / 2, - period); + period/2, + period); } } - + private void initialiseMessageStore(Configuration config) throws Exception { String messageStoreClass = config.getString("store.class"); |