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
commita6fc80b7caef30f0a157add3aa56aa9a4ff9a8c5 (patch)
treefbd9c7c202f618a8b76aa7ce4fd97b63efc8aa58
parentf07902ee61e62c9de8de8ecd594248bf0da85b6c (diff)
parentf9934df40d8490e4fce36be5aceec3c4be152292 (diff)
downloadrabbitmq-server-a6fc80b7caef30f0a157add3aa56aa9a4ff9a8c5.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 2e163cfb..b23088cc 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);