summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2012-06-27 12:28:04 +0100
committerTim Watson <tim@rabbitmq.com>2012-06-27 12:28:04 +0100
commita54198f5a64dd49f5906a784f2c768ddc8110966 (patch)
treefbd9c7c202f618a8b76aa7ce4fd97b63efc8aa58
parent0d288858e3f4ca5e3111c53ebe44ea1e682d608f (diff)
parent5b6f240a0fd0e38365bf1986b0d2db7565ac14e0 (diff)
downloadrabbitmq-server-git-a54198f5a64dd49f5906a784f2c768ddc8110966.tar.gz
merge bug24912
-rw-r--r--src/rabbit_control_main.erl5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index 2e163cfbe1..b23088cc7a 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -156,6 +156,11 @@ start() ->
{'EXIT', {badarg, _}} ->
print_error("invalid parameter: ~p", [Args]),
usage();
+ {error, {Problem, Reason}} when is_atom(Problem); is_binary(Reason) ->
+ %% We handle this common case specially to avoid ~p since
+ %% that has i18n issues
+ print_error("~s: ~s", [Problem, Reason]),
+ rabbit_misc:quit(2);
{error, Reason} ->
print_error("~p", [Reason]),
rabbit_misc:quit(2);