From e94fa2b9b5793400d49d2ea74fc430fdc831903f Mon Sep 17 00:00:00 2001 From: Tim Watson Date: Tue, 5 Nov 2013 15:10:36 +0000 Subject: Allow for runtime disabling of plugins --- scripts/rabbitmq-plugins | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index 90eb5a5d77..c6f3ff9c49 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -21,6 +21,7 @@ ##--- Set environment vars RABBITMQ_ to defaults if not set +[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} [ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR=${PLUGINS_DIR} @@ -35,4 +36,5 @@ exec ${ERL_DIR}erl \ -s rabbit_plugins_main \ -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \ -plugins_dist_dir "$RABBITMQ_PLUGINS_DIR" \ + -nodename $RABBITMQ_NODENAME \ -extra "$@" -- cgit v1.2.1 From ff99195d974bfc048db42a03b0d93b3d687fdd21 Mon Sep 17 00:00:00 2001 From: Tim Watson Date: Tue, 5 Nov 2013 15:13:03 +0000 Subject: Ensure we pass the nodename on windows --- scripts/rabbitmq-plugins.bat | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index 0d1f128ea1..252ecb3a20 100755 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -31,6 +31,10 @@ if "!RABBITMQ_BASE!"=="" ( set RABBITMQ_BASE=!APPDATA!\!RABBITMQ_SERVICENAME! ) +if "!RABBITMQ_NODENAME!"=="" ( + set RABBITMQ_NODENAME=rabbit@!COMPUTERNAME! +) + if not exist "!ERLANG_HOME!\bin\erl.exe" ( echo. echo ****************************** @@ -51,7 +55,7 @@ if "!RABBITMQ_PLUGINS_DIR!"=="" ( set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins ) -"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugins!RANDOM!!TIME:~9! -s rabbit_plugins_main -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -extra !STAR! +"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugins!RANDOM!!TIME:~9! -s rabbit_plugins_main -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -nodename !RABBITMQ_NODENAME! -extra !STAR! endlocal endlocal -- cgit v1.2.1 From 9447629717e621454ee2f8735f2772f8455390e5 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Fri, 20 Jun 2014 12:00:40 +0400 Subject: Add RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS to VM arguments --- scripts/rabbitmq-server | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index bd397441a9..13411a5ab0 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -131,6 +131,7 @@ exec ${ERL_DIR}erl \ ${RABBITMQ_CONFIG_ARG} \ +W w \ ${RABBITMQ_SERVER_ERL_ARGS} \ + ${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS} \ ${RABBITMQ_LISTEN_ARG} \ -sasl errlog_type error \ -sasl sasl_error_logger false \ -- cgit v1.2.1 From a4bb6e9387b0a7359ae682c9446f12fd13e00d44 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Fri, 20 Jun 2014 12:13:32 +0400 Subject: Make sure RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS has effect on Windows --- scripts/rabbitmq-server.bat | 1 + scripts/rabbitmq-service.bat | 1 + 2 files changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 043204faaa..e23124068e 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -147,6 +147,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( -kernel inet_default_connect_options "[{nodelay, true}]" ^ !RABBITMQ_LISTEN_ARG! ^ !RABBITMQ_SERVER_ERL_ARGS! ^ +!RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^ -sasl errlog_type error ^ -sasl sasl_error_logger false ^ -rabbit error_logger {file,\""!LOGS:\=/!"\"} ^ diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 895561d4be..fb2703f25a 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -235,6 +235,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^ -os_mon start_memsup false ^ -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^ !RABBITMQ_SERVER_START_ARGS! ^ +!RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^ !RABBITMQ_DIST_ARG! ^ !STARVAR! -- cgit v1.2.1 From 96fbaa577212ca23bb296b9fd21e8846deebd7e1 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Sun, 22 Jun 2014 15:41:41 +0400 Subject: Accept SERVER_ADDITIONAL_ERL_ARGS from rabbitmq-env.conf --- scripts/rabbitmq-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 13411a5ab0..2dbda42734 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -39,7 +39,7 @@ DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE} [ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE} [ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS} - +[ "x" = "x$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" ] && RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=${SERVER_ADDITIONAL_ERL_ARGS} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} -- cgit v1.2.1 From 46bbaddccee1c4d968dec854d9af9b59267cd11c Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Thu, 3 Jul 2014 12:08:05 +0100 Subject: Port script Mnesia dir changes from bug26192. Add rabbitmqctl force_boot. --- scripts/rabbitmq-env | 44 ++++++++++++++++++++++++++++++++++++++++++++ scripts/rabbitmq-plugins | 8 -------- scripts/rabbitmq-server | 42 ------------------------------------------ scripts/rabbitmqctl | 12 +++++------- scripts/rabbitmqctl.bat | 24 +++++++++++++++++++++++- 5 files changed, 72 insertions(+), 58 deletions(-) (limited to 'scripts') diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 69d5a9c9d0..7429844088 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -58,3 +58,47 @@ fi ## Get configuration variables from the configure environment file [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true + +##--- Set environment vars RABBITMQ_ to defaults if not set + +DEFAULT_NODE_IP_ADDRESS=auto +DEFAULT_NODE_PORT=5672 +[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} +[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} + +[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_IP_ADDRESS=${DEFAULT_NODE_IP_ADDRESS} +[ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${DEFAULT_NODE_PORT} + +[ "x" = "x$RABBITMQ_DIST_PORT" ] && RABBITMQ_DIST_PORT=${DIST_PORT} +[ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${DEFAULT_NODE_PORT} + 20000)) +[ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" != "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${RABBITMQ_NODE_PORT} + 20000)) + +[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} +[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} +[ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE} +[ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE} +[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE} +[ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS} +[ "x" = "x$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" ] && RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=${SERVER_ADDITIONAL_ERL_ARGS} +[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} +[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} + +[ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${PID_FILE} +[ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid + +[ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} +[ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand + +[ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} + +[ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR=${PLUGINS_DIR} + +## Log rotation +[ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS=${LOGS} +[ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}.log" +[ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS=${SASL_LOGS} +[ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}-sasl.log" + +[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} + +##--- End of overridden variables diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index 36910effac..8b5b30b720 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -19,14 +19,6 @@ # Non-empty defaults should be set in rabbitmq-env . `dirname $0`/rabbitmq-env -##--- Set environment vars RABBITMQ_ to defaults if not set - -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} -[ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} -[ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR=${PLUGINS_DIR} - -##--- End of overridden variables - exec ${ERL_DIR}erl \ -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 2dbda42734..686c90cfe5 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -19,48 +19,6 @@ # Non-empty defaults should be set in rabbitmq-env . `dirname $0`/rabbitmq-env -##--- Set environment vars RABBITMQ_ to defaults if not set - -DEFAULT_NODE_IP_ADDRESS=auto -DEFAULT_NODE_PORT=5672 -[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} -[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} - -[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_IP_ADDRESS=${DEFAULT_NODE_IP_ADDRESS} -[ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${DEFAULT_NODE_PORT} - -[ "x" = "x$RABBITMQ_DIST_PORT" ] && RABBITMQ_DIST_PORT=${DIST_PORT} -[ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${DEFAULT_NODE_PORT} + 20000)) -[ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" != "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${RABBITMQ_NODE_PORT} + 20000)) - -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} -[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} -[ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE} -[ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE} -[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE} -[ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS} -[ "x" = "x$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" ] && RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=${SERVER_ADDITIONAL_ERL_ARGS} -[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} -[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} - -[ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${PID_FILE} -[ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid - -[ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} -[ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand - -[ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} - -[ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR=${PLUGINS_DIR} - -## Log rotation -[ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS=${LOGS} -[ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}.log" -[ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS=${SASL_LOGS} -[ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}-sasl.log" - -##--- End of overridden variables - RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT=" -noinput" [ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s rabbit boot " diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 309abf2a0d..495b06b3c4 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -19,13 +19,9 @@ # Non-empty defaults should be set in rabbitmq-env . `dirname $0`/rabbitmq-env -##--- Set environment vars RABBITMQ_ to defaults if not set - -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} -[ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} - -##--- End of overridden variables - +# We specify Mnesia dir and sasl error logger since some actions +# (e.g. forget_cluster_node --offline) require us to impersonate the +# real node. exec ${ERL_DIR}erl \ -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ @@ -33,6 +29,8 @@ exec ${ERL_DIR}erl \ ${RABBITMQ_CTL_ERL_ARGS} \ -sname rabbitmqctl$$ \ -boot "${CLEAN_BOOT_FILE}" \ + -sasl errlog_type error \ + -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ -s rabbit_control_main \ -nodename $RABBITMQ_NODENAME \ -extra "$@" diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 8e8ba1bd71..22eabf940b 100755 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -23,6 +23,10 @@ set TDP0=%~dp0 set STAR=%* setlocal enabledelayedexpansion +if "!RABBITMQ_BASE!"=="" ( + set RABBITMQ_BASE=!APPDATA!\RabbitMQ +) + if "!COMPUTERNAME!"=="" ( set COMPUTERNAME=localhost ) @@ -31,6 +35,14 @@ if "!RABBITMQ_NODENAME!"=="" ( set RABBITMQ_NODENAME=rabbit@!COMPUTERNAME! ) +if "!RABBITMQ_MNESIA_BASE!"=="" ( + set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE!/db +) + +if "!RABBITMQ_MNESIA_DIR!"=="" ( + set RABBITMQ_MNESIA_DIR=!RABBITMQ_MNESIA_BASE!/!RABBITMQ_NODENAME!-mnesia +) + if not exist "!ERLANG_HOME!\bin\erl.exe" ( echo. echo ****************************** @@ -43,7 +55,17 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( exit /B ) -"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl!RANDOM!!TIME:~9! -s rabbit_control_main -nodename !RABBITMQ_NODENAME! -extra !STAR! +"!ERLANG_HOME!\bin\erl.exe" ^ +-pa "!TDP0!..\ebin" ^ +-noinput ^ +-hidden ^ +!RABBITMQ_CTL_ERL_ARGS! ^ +-sasl errlog_type error ^ +-mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^ +-sname rabbitmqctl!RANDOM!!TIME:~9! ^ +-s rabbit_control_main ^ +-nodename !RABBITMQ_NODENAME! ^ +-extra !STAR! endlocal endlocal -- cgit v1.2.1 From 2547743c5806c8679ed54fe72e71b00d4210aebf Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Fri, 4 Jul 2014 14:48:43 +0100 Subject: Remove these that were merged by accident; we do distribution by hand now. --- scripts/rabbitmqctl | 1 - scripts/rabbitmqctl.bat | 1 - 2 files changed, 2 deletions(-) (limited to 'scripts') diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 495b06b3c4..032d10bf6b 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -27,7 +27,6 @@ exec ${ERL_DIR}erl \ -noinput \ -hidden \ ${RABBITMQ_CTL_ERL_ARGS} \ - -sname rabbitmqctl$$ \ -boot "${CLEAN_BOOT_FILE}" \ -sasl errlog_type error \ -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 22eabf940b..a3734088f6 100755 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -62,7 +62,6 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( !RABBITMQ_CTL_ERL_ARGS! ^ -sasl errlog_type error ^ -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^ --sname rabbitmqctl!RANDOM!!TIME:~9! ^ -s rabbit_control_main ^ -nodename !RABBITMQ_NODENAME! ^ -extra !STAR! -- cgit v1.2.1 From 67ff462c80d97792c7236fc021695585699a93a1 Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Mon, 7 Jul 2014 13:50:52 +0100 Subject: Start a dummy node first to ensure epmd is running. --- scripts/rabbitmqctl | 4 ++++ scripts/rabbitmqctl.bat | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'scripts') diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 032d10bf6b..cbdf3f454d 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -19,6 +19,10 @@ # Non-empty defaults should be set in rabbitmq-env . `dirname $0`/rabbitmq-env +# rabbitmqctl starts distribution itself, so we need to make sure epmd +# is running. +${ERL_DIR}erl -sname rabbitmqctl-prelaunch-$$ -eval 'erlang:halt().' + # We specify Mnesia dir and sasl error logger since some actions # (e.g. forget_cluster_node --offline) require us to impersonate the # real node. diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index a3734088f6..9266a48034 100755 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -55,6 +55,10 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( exit /B ) +rem rabbitmqctl starts distribution itself, so we need to make sure epmd +rem is running. +"!ERLANG_HOME!\bin\erl.exe" -sname rabbitmqctl-prelaunch-!RANDOM!!TIME:~9! -eval "erlang:halt()." + "!ERLANG_HOME!\bin\erl.exe" ^ -pa "!TDP0!..\ebin" ^ -noinput ^ -- cgit v1.2.1 From 98d6ac5ffd2af9784164eae6aa51ff95ebc18781 Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Fri, 11 Jul 2014 14:18:47 +0100 Subject: Oops, silence. --- scripts/rabbitmqctl | 2 +- scripts/rabbitmqctl.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index cbdf3f454d..31fe0afcc1 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -21,7 +21,7 @@ # rabbitmqctl starts distribution itself, so we need to make sure epmd # is running. -${ERL_DIR}erl -sname rabbitmqctl-prelaunch-$$ -eval 'erlang:halt().' +${ERL_DIR}erl -sname rabbitmqctl-prelaunch-$$ -noinput -eval 'erlang:halt().' # We specify Mnesia dir and sasl error logger since some actions # (e.g. forget_cluster_node --offline) require us to impersonate the diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 9266a48034..7a2c454cd2 100755 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -57,7 +57,7 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( rem rabbitmqctl starts distribution itself, so we need to make sure epmd rem is running. -"!ERLANG_HOME!\bin\erl.exe" -sname rabbitmqctl-prelaunch-!RANDOM!!TIME:~9! -eval "erlang:halt()." +"!ERLANG_HOME!\bin\erl.exe" -sname rabbitmqctl-prelaunch-!RANDOM!!TIME:~9! -noinput -eval "erlang:halt()." "!ERLANG_HOME!\bin\erl.exe" ^ -pa "!TDP0!..\ebin" ^ -- cgit v1.2.1