diff options
| author | Simon MacMullen <simon@lshift.net> | 2010-03-24 10:24:50 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@lshift.net> | 2010-03-24 10:24:50 +0000 |
| commit | 9e86ec60fe85175fd9616e2e9724e757160c7e35 (patch) | |
| tree | 0edc40858e71075b43e7a3463aaf3f6c57b2e930 /src | |
| parent | b2de145777065528fa258cef162f44ae29d54d33 (diff) | |
| download | rabbitmq-server-git-9e86ec60fe85175fd9616e2e9724e757160c7e35.tar.gz | |
Make the generated usage functions just return a string, not print and halt.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index c249af8797..003deb54a0 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -131,7 +131,8 @@ stop() -> ok. usage() -> - rabbitmqctl_usage:usage(). + io:format(rabbitmqctl_usage:usage()), + halt(1). action(stop, Node, [], Inform) -> Inform("Stopping and halting node ~p", [Node]), diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 39345e4592..03b2a1d28d 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -87,7 +87,8 @@ stop() -> ok. usage() -> - rabbitmqmulti_usage:usage(). + io:format(rabbitmqmulti_usage:usage()), + halt(1). action(start_all, [NodeCount], RpcTimeout) -> io:format("Starting all nodes...~n", []), |