diff options
| -rw-r--r-- | src/rabbit.erl | 21 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 8 |
2 files changed, 12 insertions, 17 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 69f72bfd55..5d01415821 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -268,20 +268,15 @@ sasl_log_location() -> reopen_main_logs() -> case error_log_location() of - tty -> ok; - File -> error_logger:swap_handler({logfile, File}) + tty -> ok; + File -> error_logger:swap_handler({logfile, File}) end. reopen_sasl_logs() -> - try - case sasl_log_location() of - undefined -> ok; - tty -> ok; - {file, File} -> gen_event:swap_handler(error_logger, - {sasl_error_logger, swap}, - {sasl_report_file_h, File}); - _ -> ok - end - catch - _ -> ok + case sasl_log_location() of + undefined -> ok; + tty -> ok; + File -> gen_event:swap_handler(error_logger, + {sasl_error_logger, swap}, + {sasl_report_file_h, File}); end. diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 999e5fdd08..5879c81176 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -114,10 +114,6 @@ action(reset, Node, []) -> io:format("Resetting node ~p ...", [Node]), call(Node, {rabbit_mnesia, reset, []}); -action(reopen_logs, Node, []) -> - io:format("Reopening logs for node ~p ...", [Node]), - call(Node, {rabbit, reopen_logs, []}); - action(force_reset, Node, []) -> io:format("Forcefully resetting node ~p ...", [Node]), call(Node, {rabbit_mnesia, force_reset, []}); @@ -134,6 +130,10 @@ action(status, Node, []) -> io:format("~n~p~n", [Res]), ok; +action(reopen_logs, Node, []) -> + io:format("Reopening logs for node ~p ...", [Node]), + call(Node, {rabbit, reopen_logs, []}); + action(add_user, Node, Args = [Username, _Password]) -> io:format("Creating user ~p ...", [Username]), call(Node, {rabbit_access_control, add_user, Args}); |