diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-10 16:24:15 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-10 16:24:15 +0100 |
| commit | b461480f43bc12891229b83d7f8d71a7e8fb8152 (patch) | |
| tree | 1d796af672c71a9c3d8e6e9588b75cb2a0130ba4 /src/rabbit.erl | |
| parent | 21423cc3924cde75c500c575d43b5bb187373c7c (diff) | |
| parent | 3e4193fb5f489c1bea3a84fb296adb6c332bea3b (diff) | |
| download | rabbitmq-server-git-b461480f43bc12891229b83d7f8d71a7e8fb8152.tar.gz | |
merge bug24919
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index b1f786a08c..ea9731b68b 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -197,7 +197,7 @@ rabbit_queue_index, gen, dict, ordsets, file_handle_cache, rabbit_msg_store, array, rabbit_msg_store_ets_index, rabbit_msg_file, rabbit_exchange_type_fanout, rabbit_exchange_type_topic, mnesia, - mnesia_lib, rpc, mnesia_tm, qlc, sofs, proplists, credit_flow]). + mnesia_lib, rpc, mnesia_tm, qlc, sofs, proplists, credit_flow, pmon]). %% HiPE compilation uses multiple cores anyway, but some bits are %% IO-bound so we can go faster if we parallelise a bit more. In @@ -621,15 +621,12 @@ log_location(Type) -> rotate_logs(File, Suffix, Handler) -> rotate_logs(File, Suffix, Handler, Handler). -rotate_logs(File, Suffix, OldHandler, NewHandler) -> - case File of - undefined -> ok; - tty -> ok; - _ -> gen_event:swap_handler( - error_logger, - {OldHandler, swap}, - {NewHandler, {File, Suffix}}) - end. +rotate_logs(undefined, _Suffix, _OldHandler, _NewHandler) -> ok; +rotate_logs(tty, _Suffix, _OldHandler, _NewHandler) -> ok; +rotate_logs(File, Suffix, OldHandler, NewHandler) -> + gen_event:swap_handler(error_logger, + {OldHandler, swap}, + {NewHandler, {File, Suffix}}). log_rotation_result({error, MainLogError}, {error, SaslLogError}) -> {error, {{cannot_rotate_main_logs, MainLogError}, |