diff options
| author | Tim Watson <tim.watson@gmail.com> | 2012-05-21 14:41:57 +0100 |
|---|---|---|
| committer | Tim Watson <tim.watson@gmail.com> | 2012-05-21 14:41:57 +0100 |
| commit | 13389eb3fb5b53d5c4d5429f7dc052e528391c3d (patch) | |
| tree | 2b4bfda8316cbb27f562a159ae12a8524b20e349 | |
| parent | a57dae43426c0a0bbffcd361e84f59eda92c7276 (diff) | |
| download | rabbitmq-server-git-13389eb3fb5b53d5c4d5429f7dc052e528391c3d.tar.gz | |
manually merge 3c20079f0601
| -rwxr-xr-x | scripts/rabbitmqctl | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl.bat | 2 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 4aad6b8f33..a5fade7222 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -32,6 +32,6 @@ exec erl \ -hidden \ ${RABBITMQ_CTL_ERL_ARGS} \ -sname rabbitmqctl$$ \ - -s rabbit_control \ + -s rabbit_control_main \ -nodename $RABBITMQ_NODENAME \ -extra "$@" diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index f37fae48a6..55a3d8b2ea 100755 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -43,7 +43,7 @@ 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! -s rabbit_control -nodename !RABBITMQ_NODENAME! -extra !STAR!
+"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl!RANDOM! -s rabbit_control_main -nodename !RABBITMQ_NODENAME! -extra !STAR!
endlocal
endlocal
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 6dc8d445dd..b1c120bd8c 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -14,7 +14,7 @@ %% Copyright (c) 2007-2012 VMware, Inc. All rights reserved. %% --module(rabbit_control). +-module(rabbit_control_main). -include("rabbit.hrl"). -export([start/0, stop/0, action/5]). diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 96b5fa3885..c73a51c95c 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1573,7 +1573,7 @@ control_action(Command, Args, NewOpts) -> expand_options(default_options(), NewOpts)). control_action(Command, Node, Args, Opts) -> - case catch rabbit_control:action( + case catch rabbit_control_main:action( Command, Node, Args, Opts, fun (Format, Args1) -> io:format(Format ++ " ...~n", Args1) |