diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java index bec86945..1c706d51 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java @@ -947,6 +947,16 @@ public class CachingConnectionFactory extends AbstractConnectionFactory @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + if (logger.isTraceEnabled() && !method.getName().equals("toString") + && !method.getName().equals("hashCode") && !method.getName().equals("equals")) { + try { + logger.trace(this.target + " channel." + method.getName() + "(" + + (args != null ? Arrays.toString(args) : "") + ")"); + } + catch (Exception e) { + // empty - some mocks fail here + } + } String methodName = method.getName(); if (methodName.equals("txSelect") && !this.transactional) { throw new UnsupportedOperationException("Cannot start transaction on non-transactional channel"); diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java index e382f46b..b234fc59 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java @@ -920,7 +920,9 @@ public class BlockingQueueConsumer implements RecoveryListener { public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException { if (logger.isDebugEnabled()) { - logger.debug("Storing delivery for " + BlockingQueueConsumer.this); + logger.debug("Storing delivery for consumerTag: '" + + consumerTag + "' with deliveryTag: '" + envelope.getDeliveryTag() + "' in " + + BlockingQueueConsumer.this); } try { if (BlockingQueueConsumer.this.abortStarted > 0) {