You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/04/21 13:31:19 UTC
svn commit: r936259 - in /qpid/trunk/qpid/java: ./ broker/
broker/src/main/java/org/apache/qpid/server/virtualhost/
broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
Author: robbie
Date: Wed Apr 21 11:31:18 2010
New Revision: 936259
URL: http://svn.apache.org/viewvc?rev=936259&view=rev
Log:
QPID-2479: Add info/debug level logging to allow tracking the virtualhost housekeeping process
Applied patch from Sorin Suciu <ss...@gmail.com>
Merged from 0.5.x-dev r930288
Modified:
qpid/trunk/qpid/java/ (props changed)
qpid/trunk/qpid/java/broker/ (props changed)
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
Propchange: qpid/trunk/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 11:31:18 2010
@@ -1,5 +1,5 @@
/qpid/branches/0.5.x-dev:886720-886722
-/qpid/branches/0.5.x-dev/qpid/java:886720-886722,887145,892761,894875,916304,916325
+/qpid/branches/0.5.x-dev/qpid/java:886720-886722,887145,892761,894875,916304,916325,930288
/qpid/branches/java-broker-0-10/qpid/java:795950-829653
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/trunk/qpid:796646-796653
Propchange: qpid/trunk/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 11:31:18 2010
@@ -1,4 +1,4 @@
-/qpid/branches/0.5.x-dev/qpid/java/broker:886720-886722,887145,892761
+/qpid/branches/0.5.x-dev/qpid/java/broker:886720-886722,887145,892761,930288
/qpid/branches/java-broker-0-10/qpid/java/broker:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
Propchange: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 21 11:31:18 2010
@@ -0,0 +1 @@
+/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:930288
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java?rev=936259&r1=936258&r2=936259&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java Wed Apr 21 11:31:18 2010
@@ -286,28 +286,32 @@ public class VirtualHostImpl implements
/* add a timer task to iterate over queues, cleaning expired messages from queues with no consumers */
if (period != 0L)
{
- class RemoveExpiredMessagesTask extends TimerTask
+ class HouseKeepingTask extends TimerTask
{
+ Logger _hkLogger = Logger.getLogger(HouseKeepingTask.class);
+
public void run()
{
+ _hkLogger.info("Starting the houseKeeping job");
for (AMQQueue q : _queueRegistry.getQueues())
{
-
+ _hkLogger.debug("Checking message status for queue: "+q.getName().toString());
try
{
q.checkMessageStatus();
}
catch (Exception e)
{
- _logger.error("Exception in housekeeping for queue: " + q.getNameShortString().toString(), e);
+ _hkLogger.error("Exception in housekeeping for queue: " + q.getNameShortString().toString(), e);
//Don't throw exceptions as this will stop the
// house keeping task from running.
}
}
+ _hkLogger.info("HouseKeeping job completed.");
}
}
- final TimerTask expiredMessagesTask = new RemoveExpiredMessagesTask();
+ final TimerTask expiredMessagesTask = new HouseKeepingTask();
scheduleTask(period, expiredMessagesTask);
class ForceChannelClosuresTask extends TimerTask
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org