summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2012-05-04 11:59:25 +0100
committerEmile Joubert <emile@rabbitmq.com>2012-05-04 11:59:25 +0100
commit8846f10f245417fb445c9d09f01f5ad83bc732a8 (patch)
tree7fd675a2b5b25c0fd62e4ccfb7376ad21bdf37aa /src/rabbit.erl
parent224d28b891d3a159e09c436157650a2bda098824 (diff)
parent7a19a9572821f58b3ee2b4ceff317fd53ed50f08 (diff)
downloadrabbitmq-server-git-8846f10f245417fb445c9d09f01f5ad83bc732a8.tar.gz
Merged bug24889 into default
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index b1f786a08c..5e57916575 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -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},