diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2019-02-21 01:15:06 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2019-02-21 01:15:06 +0300 |
| commit | d3eb661efd89e87bc7859512bcdbe2f95fc5667d (patch) | |
| tree | 5f1ee9b2de715e03f98a76e5ac72616a849b7183 /scripts | |
| parent | 017545d13ace947c02fb64c239ab28bb3f10b8d2 (diff) | |
| parent | 9e4095fd906da893ca08b02836ce0716bbfac39f (diff) | |
| download | rabbitmq-server-git-d3eb661efd89e87bc7859512bcdbe2f95fc5667d.tar.gz | |
Merge branch 'master' into unavailable-qq-publish-fix
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 17 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 1 |
2 files changed, 17 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 2b06dec2cd..a70e902b78 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -330,7 +330,22 @@ if [ "${RABBITMQ_DEV_ENV}" ]; then "$RABBITMQ_ENABLED_PLUGINS_FILE_source" != 'environment' ]; then # We need to query the running node for the plugins directory # and the "enabled plugins" file. - eval $( (${RABBITMQ_SCRIPTS_DIR}/rabbitmqctl eval \ + for arg in "$@"; do + case "$arg" in + -n) + next_is_node=1 + ;; + *) + if test "$next_is_node"; then + # If the executed script is being passed a remote node + # name, use it here to query the remote node. + node_arg="-n $arg" + break + fi + ;; + esac + done + eval $( (${RABBITMQ_SCRIPTS_DIR}/rabbitmqctl $node_arg eval \ '{ok, F} = application:get_env(rabbit, feature_flags_file), {ok, P} = application:get_env(rabbit, plugins_dir), {ok, E} = application:get_env(rabbit, enabled_plugins_file), diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index b4863057f0..4bb680cccf 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -187,6 +187,7 @@ RABBITMQ_PRELAUNCH_NODENAME="rabbitmqprelaunch${$}@localhost" NOTIFY_SOCKET= \ RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \ ERL_CRASH_DUMP=$ERL_CRASH_DUMP \ +RABBITMQ_CONFIG_ARG_FILE=$RABBITMQ_CONFIG_ARG_FILE \ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \ -boot "${CLEAN_BOOT_FILE}" \ |