diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2011-08-26 14:23:17 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2011-08-26 14:23:17 +0100 |
commit | 68304bc1e6d99c8989e8d94ee9711999937cfc6d (patch) | |
tree | d3da647ac02c265bbc76d5a9c1720eb3c3ae06ee /src/rabbit_control.erl | |
parent | 702ab3d8162f24d6b5a4818b48dd47205bae5e7f (diff) | |
download | rabbitmq-server-68304bc1e6d99c8989e8d94ee9711999937cfc6d.tar.gz |
Revert most of the merge of bug24315 apart from rabbit_misc:with_local_io/1 since that's now used elsewhere.
Diffstat (limited to 'src/rabbit_control.erl')
-rw-r--r-- | src/rabbit_control.erl | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index b9e550c9..6b9faf9b 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -17,7 +17,7 @@ -module(rabbit_control). -include("rabbit.hrl"). --export([start/0, stop/0, action/5, diagnostics/1, log_action/3]). +-export([start/0, stop/0, action/5, diagnostics/1]). -define(RPC_TIMEOUT, infinity). @@ -50,7 +50,6 @@ -> 'ok'). -spec(diagnostics/1 :: (node()) -> [{string(), [any()]}]). -spec(usage/0 :: () -> no_return()). --spec(log_action/3 :: (node(), string(), [term()]) -> ok). -endif. @@ -73,7 +72,6 @@ start() -> Command = list_to_atom(Command0), Quiet = proplists:get_bool(?QUIET_OPT, Opts1), Node = proplists:get_value(?NODE_OPT, Opts1), - rpc_call(Node, rabbit_control, log_action, [node(), Command0, Args]), Inform = case Quiet of true -> fun (_Format, _Args1) -> ok end; false -> fun (Format, Args1) -> @@ -521,22 +519,3 @@ quit(Status) -> {unix, _} -> halt(Status); {win32, _} -> init:stop(Status) end. - -log_action(Node, Command, Args) -> - rabbit_misc:with_local_io( - fun () -> - error_logger:info_msg("~p executing~n rabbitmqctl ~s ~s~n", - [Node, Command, - format_args(mask_args(Command, Args))]) - end). - -%% Mask passwords and other sensitive info before logging. -mask_args("add_user", [Name, _Password | Args]) -> - [Name, "****" | Args]; -mask_args("change_password", [Name, _Password | Args]) -> - [Name, "****" | Args]; -mask_args(_, Args) -> - Args. - -format_args(Args) -> - string:join([io_lib:format("~p", [A]) || A <- Args], " "). |