diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-07-03 12:08:05 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-07-03 12:08:05 +0100 |
| commit | 46bbaddccee1c4d968dec854d9af9b59267cd11c (patch) | |
| tree | 5259ab0fce0a35d69921229b8ec04c7bd6bd0544 /scripts/rabbitmqctl | |
| parent | 4b22985c11dab92f396dde4891718be2f2d2daaa (diff) | |
| download | rabbitmq-server-git-46bbaddccee1c4d968dec854d9af9b59267cd11c.tar.gz | |
Port script Mnesia dir changes from bug26192. Add rabbitmqctl force_boot.
Diffstat (limited to 'scripts/rabbitmqctl')
| -rwxr-xr-x | scripts/rabbitmqctl | 12 |
1 files changed, 5 insertions, 7 deletions
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_<var_name> 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 <var_name> 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 "$@" |