refactor mask_args

1 files changed, 8 insertions, 10 deletions

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index ad0b6d0c65..bb42efb611 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -75,8 +75,8 @@ start() ->
     Quiet = proplists:get_bool(?QUIET_OPT, Opts1),
     Node = proplists:get_value(?NODE_OPT, Opts1),
     rpc_call(Node, rabbit_control, log_anytime,
-             ["~p executing~nrabbitmqctl ~p~n",
-              [node(), mask_args([Command0 | Args])]]),
+             ["~p executing~nrabbitmqctl ~p ~p~n",
+              [node(), Command0, mask_args(Command0, Args)]]),
     Inform = case Quiet of
                  true  -> fun (_Format, _Args1) -> ok end;
                  false -> fun (Format, Args1) ->
@@ -488,11 +488,9 @@ quit(Status) ->
     end.
 
 %% Mask passwords and other sensitive info before logging.
-mask_args([]) ->
-    [];
-mask_args(["add_user", Name, Password | Args]) ->
-    ["add_user", Name, "****" | mask_args(Args)];
-mask_args(["change_password", Name, Password | Args]) ->
-    ["change_password", Name, "****" | mask_args(Args)];
-mask_args([Arg | Args]) ->
-    [Arg | mask_args(Args)].
+mask_args("add_user", [Name, Password | Args]) ->
+    [Name, "****" | Args];
+mask_args("change_password", [Name, Password | Args]) ->
+    [Name, "****" | Args];
+mask_args(_, Args) ->
+    Args.