diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2015-12-22 12:23:42 +0000 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2015-12-30 09:01:18 +0300 |
| commit | 6f166ebc5afed2e424e976fd594369fbee81f48c (patch) | |
| tree | bfaadbc536062d4d03d92c4ef270bb2bd4aa3dbf /src | |
| parent | 1ba9534de152fc0bca9f9d490fdf6480dde0605b (diff) | |
| download | rabbitmq-server-git-6f166ebc5afed2e424e976fd594369fbee81f48c.tar.gz | |
Proper error report
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control_main.erl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index abbdd35cad..b42b818ff5 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -272,8 +272,9 @@ action(reset, Node, [], _Opts, Inform) -> case call(Node, {rabbit_mnesia, reset, []}) of ok -> ok; {error, mnesia_unexpectedly_running} -> - Inform("Error: mnesia is still running on node ~p. - It need to be stopped with stop_app first", [Node]); + {error_string, rabbit_misc:format( + " mnesia is still running on node ~p. + It need to be stopped with stop_app first", [Node])}; Other -> Other end; @@ -282,8 +283,9 @@ action(force_reset, Node, [], _Opts, Inform) -> case call(Node, {rabbit_mnesia, force_reset, []}) of ok -> ok; {error, mnesia_unexpectedly_running} -> - Inform("Error: mnesia is still running on node ~p. - It need to be stopped with stop_app first", [Node]); + {error_string, rabbit_misc:format( + " mnesia is still running on node ~p. + It need to be stopped with stop_app first", [Node])}; Other -> Other end; @@ -436,7 +438,8 @@ action(set_vm_memory_high_watermark, Node, ["absolute", Arg], _Opts, Inform) -> rpc_call(Node, vm_memory_monitor, set_vm_memory_high_watermark, [{absolute, Limit}]); {error, parse_error} -> - {error_string, "Unable to parse absolute memory limit value ~p", [Arg]} + {error_string, rabbit_misc:format( + "Unable to parse absolute memory limit value ~p", [Arg])} end; action(set_disk_free_limit, Node, [Arg], _Opts, Inform) -> @@ -445,7 +448,8 @@ action(set_disk_free_limit, Node, [Arg], _Opts, Inform) -> Inform("Setting disk free limit on ~p to ~p bytes", [Node, Limit]), rpc_call(Node, rabbit_disk_monitor, set_disk_free_limit, [Limit]); {error, parse_error} -> - {error_string, "Unable to parse disk free limit value ~p", [Arg]} + {error_string, rabbit_misc:format( + "Unable to parse disk free limit value ~p", [Arg])} end; action(set_disk_free_limit, Node, ["mem_relative", Arg], _Opts, Inform) -> |