Skip to content

Commit bd46d47

Browse files
garyrussellartembilan
authored andcommitted
GH-1463: RabbitTemplate.logReceived() Protected
Resolves #1463 **cherry-pick to 2.4.x**
1 parent 6c7d53c commit bd46d47

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ else if (isChannelTransacted()) {
12221222
}
12231223
return null;
12241224
}, obtainTargetConnectionFactory(this.receiveConnectionFactorySelectorExpression, queueName));
1225-
logReceived(message);
1225+
logReceived("Received: ", message);
12261226
return message;
12271227
}
12281228

@@ -1261,7 +1261,7 @@ else if (isChannelTransacted()) {
12611261
return buildMessageFromDelivery(delivery);
12621262
}
12631263
}, obtainTargetConnectionFactory(this.receiveConnectionFactorySelectorExpression, null));
1264-
logReceived(message);
1264+
logReceived("Received: ", message);
12651265
return message;
12661266
}
12671267

@@ -1412,7 +1412,7 @@ else if (channelTransacted) {
14121412
receiveMessage = buildMessageFromDelivery(delivery);
14131413
}
14141414
}
1415-
logReceived(receiveMessage);
1415+
logReceived("Received: ", receiveMessage);
14161416
return receiveMessage;
14171417
}
14181418

@@ -1467,12 +1467,21 @@ private Delivery consumeDelivery(Channel channel, String queueName, long timeout
14671467
return delivery;
14681468
}
14691469

1470-
private void logReceived(@Nullable Message message) {
1471-
if (message == null) {
1472-
logger.debug("Received no message");
1473-
}
1474-
else if (logger.isDebugEnabled()) {
1475-
logger.debug("Received: " + message);
1470+
/**
1471+
* Log a received message. The default implementation logs the full message at DEBUG
1472+
* level. Override this method to change that behavior.
1473+
* @param prefix a prefix, e.g. "Received: " or "Reply: ".
1474+
* @param message the message.
1475+
* @since 2.4.6
1476+
*/
1477+
protected void logReceived(String prefix, @Nullable Message message) {
1478+
if (logger.isDebugEnabled()) {
1479+
if (message == null) {
1480+
logger.debug(prefix + "no message");
1481+
}
1482+
else {
1483+
logger.debug(prefix + message);
1484+
}
14761485
}
14771486
}
14781487

@@ -2091,9 +2100,7 @@ private Message exchangeMessages(final String exchange, final String routingKey,
20912100
}
20922101
doSend(channel, exchange, routingKey, message, mandatory, correlationData);
20932102
reply = this.replyTimeout < 0 ? pendingReply.get() : pendingReply.get(this.replyTimeout, TimeUnit.MILLISECONDS);
2094-
if (this.logger.isDebugEnabled()) {
2095-
this.logger.debug("Reply: " + reply);
2096-
}
2103+
logReceived("Reply: ", reply);
20972104
if (reply == null) {
20982105
replyTimedOut(message.getMessageProperties().getCorrelationId());
20992106
}

0 commit comments

Comments
 (0)