simplify/generalise badarg handling

1 files changed, 5 insertions, 9 deletions

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 22e2312ee0..e9f0cf6c54 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -91,8 +91,8 @@ start() ->
             print_error("invalid command '~s'",
                         [string:join([atom_to_list(Command) | Args], " ")]),
             usage();
-        {badarg, Reason} ->
-            print_error("invalid parameter: ~s ~p", [Reason, Args]),
+        {'EXIT', {badarg, _}} ->
+            print_error("invalid parameter: ~p", [Args]),
             usage();
         {error, Reason} ->
             print_error("~p", [Reason]),
@@ -325,13 +325,9 @@ action(trace_off, Node, [], Opts, Inform) ->
     rpc_call(Node, rabbit_trace, stop, [list_to_binary(VHost)]);
 
 action(set_vm_memory_high_watermark, Node, [Arg], _Opts, Inform) ->
-    try list_to_float(Arg) of
-        Frac -> Inform("Setting memory threshhold on ~p to ~p", [Node, Frac]),
-                rpc_call(Node, vm_memory_monitor, set_vm_memory_high_watermark,
-                         [Frac])
-    catch
-        error:badarg = X -> {X, "invalid floating point format"}
-    end;
+    Frac = list_to_float(Arg),
+    Inform("Setting memory threshhold on ~p to ~p", [Node, Frac]),
+    rpc_call(Node, vm_memory_monitor, set_vm_memory_high_watermark, [Frac]);
 
 action(set_permissions, Node, [Username, CPerm, WPerm, RPerm], Opts, Inform) ->
     VHost = proplists:get_value(?VHOST_OPT, Opts),