Skip to content

Commit 70f00bb

Browse files
Merge pull request #1881 from rabbitmq/rabbitmq-server_prelaunch
Fixing RABBITMQ_CONFIG_ARG_FILE variable
2 parents d934a59 + 260098e commit 70f00bb

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

priv/schema/rabbit.schema

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,16 +1342,6 @@ end}.
13421342
{validators, ["non_zero_positive_integer"]}
13431343
]}.
13441344

1345-
{mapping, "inet_dist_listen_min", "kernel.inet_dist_listen_min",[
1346-
{datatype, [integer]},
1347-
{validators, ["non_zero_positive_integer"]}
1348-
]}.
1349-
1350-
{mapping, "inet_dist_listen_max", "kernel.inet_dist_listen_max",[
1351-
{datatype, [integer]},
1352-
{validators, ["non_zero_positive_integer"]}
1353-
]}.
1354-
13551345
% ==========================
13561346
% sysmon_handler section
13571347
% ==========================

scripts/rabbitmq-server

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +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 \
190191
RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
191192
${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \
192193
-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
@@ -576,19 +576,6 @@ credential_validator.regexp = ^abc\\d+",
576576
]}],
577577
[]},
578578

579-
{kernel_inet_dist_listen_min,
580-
"inet_dist_listen_min = 16000",
581-
[{kernel, [
582-
{inet_dist_listen_min, 16000}
583-
]}],
584-
[]},
585-
{kernel_inet_dist_listen_max,
586-
"inet_dist_listen_max = 16100",
587-
[{kernel, [
588-
{inet_dist_listen_max, 16100}
589-
]}],
590-
[]},
591-
592579
{log_syslog_settings,
593580
"log.syslog = true
594581
log.syslog.identity = rabbitmq

0 commit comments

Comments
 (0)