summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-06-03 20:36:17 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-06-03 20:36:17 +0300
commit06b35575c88d8653bf6ca981699503c6897bb2fa (patch)
tree1af4f311242d28c0644e203724d6074e893b00aa
parentc8b4adacffeedde5dbf5d2c86a5e20ddb145103a (diff)
downloadrabbitmq-server-git-06b35575c88d8653bf6ca981699503c6897bb2fa.tar.gz
Message store settings we already have use the "msg_store" prefix
-rw-r--r--Makefile1
-rw-r--r--priv/schema/rabbit.schema2
-rw-r--r--test/config_schema_SUITE_data/rabbit.snippets4
3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 213895ec16..0af1fefce6 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ define PROJECT_ENV
{connection_max, infinity},
{heartbeat, 60},
{msg_store_file_size_limit, 16777216},
+ {msg_store_shutdown_timeout, 600000},
{fhc_write_buffering, true},
{fhc_read_buffering, false},
{queue_index_max_journal_entries, 32768},
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema
index 1d95e5e0b3..b81ba0f1c4 100644
--- a/priv/schema/rabbit.schema
+++ b/priv/schema/rabbit.schema
@@ -1090,7 +1090,7 @@ end}.
{mapping, "mnesia_table_loading_retry_limit", "rabbit.mnesia_table_loading_retry_limit",
[{datatype, integer}]}.
-{mapping, "message_store_shutdown_timeout", "rabbit.message_store_shutdown_timeout",
+{mapping, "message_store_shutdown_timeout", "rabbit.msg_store_shutdown_timeout",
[
{datatype, integer},
{validators, ["non_zero_positive_integer"]}
diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets
index 4923195a25..c4ec5f12b9 100644
--- a/test/config_schema_SUITE_data/rabbit.snippets
+++ b/test/config_schema_SUITE_data/rabbit.snippets
@@ -602,10 +602,10 @@ credential_validator.regexp = ^abc\\d+",
]}],
[]},
- {rabbit_message_store_shutdown_timeout,
+ {rabbit_msg_store_shutdown_timeout,
"message_store_shutdown_timeout = 600000",
[{rabbit, [
- {message_store_shutdown_timeout, 600000}
+ {msg_store_shutdown_timeout, 600000}
]}],
[]},