summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2018-12-02 12:23:30 +0300
committerMichael Klishin <michael@clojurewerkz.org>2018-12-02 12:23:30 +0300
commit173a4395e3e335ddd8a037316cf6df822e9e2632 (patch)
tree6961ce7135202c4bc427da4b1763cfd1486cd2b3
parentb247f2ab1e478ff71c1d63c49de3474148ba5019 (diff)
downloadrabbitmq-server-git-173a4395e3e335ddd8a037316cf6df822e9e2632.tar.gz
Make it possible to configure kernel.inet_dist_listen_{min,max} via new style config
Closes #1784.
-rw-r--r--priv/schema/rabbit.schema10
-rw-r--r--test/config_schema_SUITE_data/rabbit.snippets15
2 files changed, 25 insertions, 0 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema
index 9cee795296..5c6078a413 100644
--- a/priv/schema/rabbit.schema
+++ b/priv/schema/rabbit.schema
@@ -1342,6 +1342,16 @@ end}.
{validators, ["non_zero_positive_integer"]}
]}.
+{mapping, "inet_dist_listen_min", "kernel.inet_dist_listen_min",[
+ {datatype, [integer]},
+ {validators, ["non_zero_positive_integer"]}
+]}.
+
+{mapping, "inet_dist_listen_max", "kernel.inet_dist_listen_max",[
+ {datatype, [integer]},
+ {validators, ["non_zero_positive_integer"]}
+]}.
+
% ===============================
% Validators
% ===============================
diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets
index 625fcd93a9..b318adaa12 100644
--- a/test/config_schema_SUITE_data/rabbit.snippets
+++ b/test/config_schema_SUITE_data/rabbit.snippets
@@ -568,12 +568,27 @@ credential_validator.regexp = ^abc\\d+",
{delegate_count, 64}
]}],
[]},
+
{kernel_net_ticktime,
"net_ticktime = 20",
[{kernel, [
{net_ticktime, 20}
]}],
[]},
+
+ {kernel_inet_dist_listen_min,
+ "inet_dist_listen_min = 16000",
+ [{kernel, [
+ {inet_dist_listen_min, 16000}
+ ]}],
+ []},
+ {kernel_inet_dist_listen_max,
+ "inet_dist_listen_max = 16100",
+ [{kernel, [
+ {inet_dist_listen_max, 16100}
+ ]}],
+ []},
+
{log_syslog_settings,
"log.syslog = true
log.syslog.identity = rabbitmq