summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <klishinm@vmware.com>2021-05-11 23:20:02 +0300
committerGitHub <noreply@github.com>2021-05-11 23:20:02 +0300
commit188216aad3bd6baca730a25e3cd13253d82a977f (patch)
tree90bbea0482f1c99e0130c31089526adcf762fb51
parent682b09c943da88eed36cb5f181dafec261f03085 (diff)
parent6cd4d62cefccaff8355cf373b2091ebd7a5ab0a1 (diff)
downloadrabbitmq-server-git-188216aad3bd6baca730a25e3cd13253d82a977f.tar.gz
Merge pull request #3034 from rabbitmq/mk-change-delivery-acknowledgement-timeout-error-message
Mention delivery ack timeout configurability
-rw-r--r--deps/rabbit/src/rabbit_channel.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/deps/rabbit/src/rabbit_channel.erl b/deps/rabbit/src/rabbit_channel.erl
index 6d4d793c38..065df1718b 100644
--- a/deps/rabbit/src/rabbit_channel.erl
+++ b/deps/rabbit/src/rabbit_channel.erl
@@ -2731,12 +2731,15 @@ evaluate_consumer_timeout(State0 = #ch{cfg = #conf{channel = Channel,
when is_integer(Timeout)
andalso Time < Now - Timeout ->
rabbit_log_channel:warning("Consumer ~s on channel ~w has timed out "
- "waiting on consumer acknowledgement. Timeout used: ~p ms",
+ "waiting for delivery acknowledgement. Timeout used: ~p ms. "
+ "This timeout value can be configured, see consumers doc guide to learn more",
[rabbit_data_coercion:to_binary(ConsumerTag),
Channel, Timeout]),
Ex = rabbit_misc:amqp_error(precondition_failed,
- "consumer ack timed out on channel ~w",
- [Channel], none),
+ "delivery acknowledgement on channel ~w timed out. "
+ "Timeout value used: ~p ms. "
+ "This timeout value can be configured, see consumers doc guide to learn more",
+ [Channel, Timeout], none),
handle_exception(Ex, State0);
_ ->
{noreply, State0}