diff options
| -rw-r--r-- | docs/rabbitmqctl.pod | 11 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 2 | ||||
| -rw-r--r-- | src/rabbit.erl | 66 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 13 |
5 files changed, 70 insertions, 26 deletions
diff --git a/docs/rabbitmqctl.pod b/docs/rabbitmqctl.pod index ebe0cd4393..eb1750d04c 100644 --- a/docs/rabbitmqctl.pod +++ b/docs/rabbitmqctl.pod @@ -66,8 +66,12 @@ force_reset It should only be used as a last resort if the database or cluster configuration has been corrupted. -reopen_logs +reopen_logs [suffix] instruct the RabbitMQ node to close and reopen the log files. + When the I<suffix> value is provided, the RabbitMQ broker will + attempt to append the current contents of the log file to the file + with name composed of the original name and the suffix. It will + create a new file if such a file does not already exist. This command might be helpful when you are e.g. writing your own logrotate script and you do not want to restart the RabbitMQ node. @@ -123,6 +127,11 @@ Grant user named foo access to the virtual host called test at the default Erlang node: rabbitmqctl map_user_vhost foo test + +Append current logs' content to the files with ".1" suffix and reopen +them: + + rabbitmqctl reopen_logs .1 =head1 SEE ALSO diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 5368c04cc2..d78be18eb9 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -39,6 +39,10 @@ CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config ## Log rotation LOGS="${LOG_BASE}/${NODENAME}.log" SASL_LOGS="${LOG_BASE}/${NODENAME}-sasl.log" +BACKUP_EXTENSION=".1" + +[ -f "${LOGS}" ] && cat "${LOGS}" >> "${LOGS}${BACKUP_EXTENSION}" +[ -f "${SASL_LOGS}" ] && cat "${SASL_LOGS}" >> "${SASL_LOGS}${BACKUP_EXTENSION}" if [ -f "$CLUSTER_CONFIG_FILE" ]; then CLUSTER_CONFIG="-rabbit cluster_config \"$CLUSTER_CONFIG_FILE\"" diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 46f4bd923e..a32fe0fc21 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -65,7 +65,7 @@ set LOG_BASE=%RABBITMQ_BASE_UNIX%/log rem We save the previous logs in their respective backup
rem Log management (rotation, filtering based of size...) is left as an exercice for the user.
-set BACKUP_EXTENSION=.bak
+set BACKUP_EXTENSION=.1
set LOGS="%RABBITMQ_BASE%\log\%NODENAME%.log"
set SASL_LOGS="%RABBITMQ_BASE%\log\%NODENAME%-sasl.log"
diff --git a/src/rabbit.erl b/src/rabbit.erl index 69f72bfd55..3de403789b 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -27,7 +27,7 @@ -behaviour(application). --export([start/0, stop/0, stop_and_halt/0, status/0, reopen_logs/0]). +-export([start/0, stop/0, stop_and_halt/0, status/0, reopen_logs/0, reopen_logs/1]). -export([start/2, stop/1]). @@ -39,6 +39,7 @@ -include("rabbit_framing.hrl"). -include("rabbit.hrl"). +-include_lib("kernel/include/file.hrl"). -define(APPS, [os_mon, mnesia, rabbit]). @@ -50,6 +51,7 @@ -spec(stop/0 :: () -> 'ok'). -spec(stop_and_halt/0 :: () -> 'ok'). -spec(reopen_logs/0 :: () -> 'ok'). +-spec(reopen_logs/1 :: name() -> 'ok' | {'error', 'cannot_append_logfile'}). -spec(status/0 :: () -> [{running_applications, [{atom(), string(), string()}]} | {nodes, [node()]} | @@ -87,8 +89,15 @@ status() -> rabbit_mnesia:status(). reopen_logs() -> - ok = reopen_main_logs(), - ok = reopen_sasl_logs(). + ok = reopen_logs(error_log_location(), [], main_log), + ok = reopen_logs(sasl_log_location(), [], sasl_log). + +reopen_logs(Suffix) -> + LSuffix = binary_to_list(Suffix), + case reopen_logs(error_log_location(), LSuffix, main_log) of + ok -> reopen_logs(sasl_log_location(), LSuffix, sasl_log); + Error -> Error + end. %%-------------------------------------------------------------------- @@ -266,22 +275,41 @@ sasl_log_location() -> _ -> undefined end. -reopen_main_logs() -> - case error_log_location() of - tty -> ok; - File -> error_logger:swap_handler({logfile, File}) +reopen_logs(File, Suffix,Swap) -> + case File of + undefined -> ok; + tty -> ok; + _ -> case append_to_log_file(File, Suffix) of + omit -> swap_handler(Swap, File); + ok -> swap_handler(Swap, File); + Error -> Error + end 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 +swap_handler(main_log, File) -> + error_logger:swap_handler({logfile, File}), + error_logger:delete_report_handler(error_logger_file_h), + ok; +swap_handler(sasl_log, File ) -> + gen_event:swap_handler(error_logger, + {error_logger, swap}, + {sasl_report_file_h, File}), + gen_event:add_handler(error_logger, error_logger, []), + error_logger:delete_report_handler(sasl_report_file_h), + ok. + +append_to_log_file(File, Suffix) -> + case file:read_file_info(File) of + {ok, FInfo} -> append_file(File, FInfo#file_info.size, Suffix); + {error, _} -> ok + end. + +append_file(_, 0, _) -> + omit; +append_file(_, _, []) -> + omit; +append_file(File, _, Suffix) -> + case file:read_file(File) of + {ok, Data} -> file:write_file([File, Suffix], Data, [append]); + {error, _} -> {error, cannot_append_logfile} end. diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 999e5fdd08..4c1b92bbf2 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -73,7 +73,7 @@ Available commands: force_reset cluster <ClusterNode> ... status - reopen_logs + reopen_logs [Suffix] add_user <UserName> <Password> delete_user <UserName> @@ -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,13 @@ 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(reopen_logs, Node, Args = [Suffix]) -> + io:format("Moving logs to files with suffix ~p and reopening logs ...", [Suffix]), + call(Node, {rabbit, reopen_logs, Args}); + action(add_user, Node, Args = [Username, _Password]) -> io:format("Creating user ~p ...", [Username]), call(Node, {rabbit_access_control, add_user, Args}); |