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 | 4257f70b33af0217c75a5fcfc356df6548470242 (patch) | |
| tree | 0edc40858e71075b43e7a3463aaf3f6c57b2e930 | |
| parent | 1f913f8e27fdd59373b072bb7bc7f219dd461f71 (diff) | |
| download | rabbitmq-server-4257f70b33af0217c75a5fcfc356df6548470242.tar.gz | |
Make the generated usage functions just return a string, not print and halt.
| -rw-r--r-- | docs/usage.xsl | 4 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/docs/usage.xsl b/docs/usage.xsl index 841b2a84..f2e4c822 100644 --- a/docs/usage.xsl +++ b/docs/usage.xsl @@ -18,7 +18,7 @@ <!-- Pull out cmdsynopsis to show the command usage line. -->%% Generated, do not edit! -module(<xsl:value-of select="$modulename" />). -export([usage/0]). -usage() -> io:format(%QUOTE%Usage: +usage() -> %QUOTE%Usage: <xsl:value-of select="refentry/refsynopsisdiv/cmdsynopsis/command"/> <xsl:text> </xsl:text> <xsl:for-each select="refentry/refsynopsisdiv/cmdsynopsis/arg"> @@ -60,7 +60,7 @@ usage() -> io:format(%QUOTE%Usage: </xsl:for-each> <xsl:apply-templates select=".//*[title='Commands']/refsect2" mode="command-usage" /> -%QUOTE%), halt(1). +%QUOTE%. </xsl:template> <!-- Option lists in command usage --> diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index c249af87..003deb54 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 39345e45..03b2a1d2 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", []), |