diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-03-29 12:18:04 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-03-29 12:18:04 +0100 |
| commit | 5b2bc44ee6707752719fe4778a5de6f4c7c36d80 (patch) | |
| tree | e02863467d4fcaca06cf7057da8045f34baa6843 | |
| parent | b53eacfaccd14cd60fb06722b41a85c6cba36c62 (diff) | |
| parent | 628fa17ddacdaf59c573d5707bbb6b5b84891f25 (diff) | |
| download | rabbitmq-server-git-5b2bc44ee6707752719fe4778a5de6f4c7c36d80.tar.gz | |
Merging bug 22559 onto default
| -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 04beebca7e..a29174016f 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 f2f291692a..d1834b3b73 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -131,7 +131,8 @@ stop() -> ok. usage() -> - rabbit_ctl_usage:usage(). + io:format("~s", [rabbit_ctl_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 9ff2c5cb11..336f74bf9a 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -87,7 +87,8 @@ stop() -> ok. usage() -> - rabbit_multi_usage:usage(). + io:format("~s", [rabbit_multi_usage:usage()]), + halt(1). action(start_all, [NodeCount], RpcTimeout) -> io:format("Starting all nodes...~n", []), |