diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-01-15 16:44:02 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-01-15 16:44:02 +0000 |
| commit | cc27de484c4c32f200d365a2075f207e979d5661 (patch) | |
| tree | 8da1cf521b4a0011370b2c6933c51bc9ae0708ab | |
| parent | 10940d75bd4143924e786940f4b34b49bd3bff2b (diff) | |
| parent | 6ce8d77df72bec2465607c6159ab477c95789a24 (diff) | |
| download | rabbitmq-server-cc27de484c4c32f200d365a2075f207e979d5661.tar.gz | |
merge bug20125 into v1_5_1
| -rw-r--r-- | docs/rabbitmqctl.1.pod | 8 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod index b9edd584..c57e0fd1 100644 --- a/docs/rabbitmqctl.1.pod +++ b/docs/rabbitmqctl.1.pod @@ -146,8 +146,8 @@ auto_delete arguments queue arguments -pid - Erlang process identifier associated with the queue +node + node on which the process associated with the queue resides messages_ready number of ready messages @@ -214,8 +214,8 @@ list_connections [I<connectioninfoitem> ...] =over 4 -pid - Erlang process id associated with the connection +node + node on which the process associated with the connection resides address server IP number diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 1e07f6d2..cbc11b40 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -57,7 +57,7 @@ start() -> true -> ok; false -> io:format("...done.~n") end, - init:stop(); + halt(); {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} -> error("invalid command '~s'", [lists:flatten( diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 7f6eaa8e..5e8edd53 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -50,7 +50,7 @@ start() -> case catch action(Command, Args, RpcTimeout) of ok -> io:format("done.~n"), - init:stop(); + halt(); {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} -> error("invalid command '~s'", [lists:flatten( |