Skip to content

Commit 85b1ef7

Browse files
lukebakkenkjnilsson
authored andcommitted
Remove inet_dist_listen_min / max from ini schema since they do not work
(cherry picked from commit 260098e)
1 parent 6b1f270 commit 85b1ef7

File tree

3 files changed

+1
-24
lines changed

3 files changed

+1
-24
lines changed

priv/schema/rabbit.schema

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,16 +1352,6 @@ end}.
13521352
{validators, ["non_zero_positive_integer"]}
13531353
]}.
13541354

1355-
{mapping, "inet_dist_listen_min", "kernel.inet_dist_listen_min",[
1356-
{datatype, [integer]},
1357-
{validators, ["non_zero_positive_integer"]}
1358-
]}.
1359-
1360-
{mapping, "inet_dist_listen_max", "kernel.inet_dist_listen_max",[
1361-
{datatype, [integer]},
1362-
{validators, ["non_zero_positive_integer"]}
1363-
]}.
1364-
13651355
% ==========================
13661356
% sysmon_handler section
13671357
% ==========================

scripts/rabbitmq-server

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ RABBITMQ_PRELAUNCH_NODENAME="rabbitmqprelaunch${$}@localhost"
187187
NOTIFY_SOCKET= \
188188
RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
189189
ERL_CRASH_DUMP=$ERL_CRASH_DUMP \
190-
RABBITMQ_CONFIG_ARG_FILE=$RABBITMQ_CONFIG_ARG_FILE \
190+
RABBITMQ_CONFIG_ARG_FILE=$RABBITMQ_CONFIG_ARG_FILE \
191191
RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
192192
${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \
193193
-boot "${CLEAN_BOOT_FILE}" \

test/config_schema_SUITE_data/rabbit.snippets

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -580,19 +580,6 @@ credential_validator.regexp = ^abc\\d+",
580580
]}],
581581
[]},
582582

583-
{kernel_inet_dist_listen_min,
584-
"inet_dist_listen_min = 16000",
585-
[{kernel, [
586-
{inet_dist_listen_min, 16000}
587-
]}],
588-
[]},
589-
{kernel_inet_dist_listen_max,
590-
"inet_dist_listen_max = 16100",
591-
[{kernel, [
592-
{inet_dist_listen_max, 16100}
593-
]}],
594-
[]},
595-
596583
{log_syslog_settings,
597584
"log.syslog = true
598585
log.syslog.identity = rabbitmq

0 commit comments

Comments
 (0)