summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2019-11-14 20:50:44 +0300
committerGitHub <noreply@github.com>2019-11-14 20:50:44 +0300
commit9045fbe0ed76d1c74823ff1517a6f5b8c62cfa08 (patch)
treea94a5b3a6b2e6ca8a4d509cd99267c235294c72a
parent248bccef3cb9232bafa95c173357b2c619575238 (diff)
parent556ecb0c35c65b12b98734196aa7d549d941dd4c (diff)
downloadrabbitmq-server-git-9045fbe0ed76d1c74823ff1517a6f5b8c62cfa08.tar.gz
Merge pull request #2163 from rabbitmq/consumer-timeout-schema
Add consumer_timeout to config schema
-rw-r--r--priv/schema/rabbit.schema10
-rw-r--r--test/config_schema_SUITE_data/rabbit.snippets7
2 files changed, 17 insertions, 0 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema
index 8db2ebf3ff..e05623ae78 100644
--- a/priv/schema/rabbit.schema
+++ b/priv/schema/rabbit.schema
@@ -1068,6 +1068,16 @@ end}.
{mapping, "vhost_restart_strategy", "rabbit.vhost_restart_strategy",
[{datatype, {enum, [stop_node, continue, transient, persistent]}}]}.
+%% Approximate maximum time a consumer can spend processing a message before
+%% the channel is terminated, in milliseconds. Default is no timeout.
+%%
+%% {consumer_timeout, 10000},
+
+{mapping, "consumer_timeout", "rabbit.consumer_timeout", [
+ {datatype, integer},
+ {validators, ["non_zero_positive_integer"]}
+]}.
+
% ==========================
% Lager section
% ==========================
diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets
index fc0c2b7000..078669abfe 100644
--- a/test/config_schema_SUITE_data/rabbit.snippets
+++ b/test/config_schema_SUITE_data/rabbit.snippets
@@ -588,6 +588,13 @@ credential_validator.regexp = ^abc\\d+",
]}],
[]},
+ {rabbit_consumer_timeout,
+ "consumer_timeout = 20000",
+ [{rabbit, [
+ {consumer_timeout, 20000}
+ ]}],
+ []},
+
{log_syslog_settings,
"log.syslog = true
log.syslog.identity = rabbitmq