diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-03-13 12:23:12 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-03-13 12:23:12 +0000 |
| commit | 4409ca8f8585fa2e2f7c530be3dd8c1c733e03bb (patch) | |
| tree | 761c93cd455ec74e7bd3fc3a577fbe1f5e580091 /qpid/java | |
| parent | 04edf83c4c5b7ea62c36109483bf75fe53345ca1 (diff) | |
| download | qpid-python-4409ca8f8585fa2e2f7c530be3dd8c1c733e03bb.tar.gz | |
QPID-1730 : Improve the logging so we can see what is going one during persistent recovery as we do not have a working persistent module.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@753220 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
4 files changed, 20 insertions, 5 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index b6c741bbec..30af09ce4b 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -191,7 +191,7 @@ public abstract class AbstractExchange implements Exchange, Managable public String toString() { - return getClass().getName() + "[" + getName() +"]"; + return getClass().getSimpleName() + "[" + getName() +"]"; } public ManagedObject getManagedObject() diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java index e39c005750..e9af92bad8 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java @@ -168,16 +168,14 @@ public class DirectExchange extends AbstractExchange { if (_logger.isDebugEnabled()) { - _logger.debug("Queue (" + queue.getName() + ")" + queue + " is already registered with routing key " + routingKey); + _logger.debug("Queue (" + queue + ") is already registered with routing key " + routingKey); } } else { if (_logger.isDebugEnabled()) { - _logger.debug("Binding queue(" + queue.getName() + ") " + queue + " with routing key " + routingKey - + (args == null ? "" : " and arguments " + args.toString()) - + " to exchange " + this); + _logger.debug("Binding queue:" + queue + " with routing key '" + routingKey +"' to exchange:" + this); } } } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java index ade780d0bb..f5cc694e86 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java @@ -68,4 +68,10 @@ public class AMQPriorityQueue extends SimpleAMQQueue } } + @Override + public String getType() + { + return getClass().getName() + "[" + getName() + "][Priorities:" + getPriorities() + "]"; + } + } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java index 63ec56c1af..ed9b1eb8d7 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java @@ -1607,4 +1607,15 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener } return ids; } + + + public String getType() + { + return getClass().getSimpleName() + "[" + getName() +"]"; + } + + public String toString() + { + return getType() + "[Owner:" + _owner + "][Durable:" + _durable + "]"; + } } |