summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkjnilsson <knilsson@pivotal.io>2021-04-20 17:44:14 +0100
committerkjnilsson <knilsson@pivotal.io>2021-04-21 09:58:41 +0100
commit2ab05b8ff583694ae708b1f4f2e2826f89c476b6 (patch)
tree94e5b0948002f4fd65e666d73a5049244eb58495
parenta17dde45bc309509046615a30f371fd775f66c06 (diff)
downloadrabbitmq-server-git-consumer-timeout-default.tar.gz
Set a default for consumer_timeoutconsumer-timeout-default
So that faulty consumers that will never ack a pending messages have their channels closed after 15 minutes.
-rw-r--r--deps/rabbit/Makefile2
-rw-r--r--deps/rabbit/docs/rabbitmq.conf.example7
2 files changed, 9 insertions, 0 deletions
diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile
index bea8ecb5c3..d4105d9e1a 100644
--- a/deps/rabbit/Makefile
+++ b/deps/rabbit/Makefile
@@ -85,6 +85,8 @@ define PROJECT_ENV
%% see rabbitmq-server#248
%% and rabbitmq-server#667
{channel_operation_timeout, 15000},
+ %% 15 minutes
+ {consumer_timeout, 900000},
%% see rabbitmq-server#486
{autocluster,
diff --git a/deps/rabbit/docs/rabbitmq.conf.example b/deps/rabbit/docs/rabbitmq.conf.example
index 79adaed7c7..944b38e945 100644
--- a/deps/rabbit/docs/rabbitmq.conf.example
+++ b/deps/rabbit/docs/rabbitmq.conf.example
@@ -576,6 +576,13 @@
## on Windows.
# motd_file = /etc/rabbitmq/motd
+## Consumer timeout
+## If a message delivered to a consumer has not been acknowledge before this timer
+## triggers the channel will be force closed by the broker. This ensure that
+## faultly consumers that never ack will not hold on to messages indefinitely.
+##
+# consumer_timeout = 900000
+
## ----------------------------------------------------------------------------
## Advanced Erlang Networking/Clustering Options.
##