summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Videla <videlalvaro@gmail.com>2015-10-06 16:29:38 +0200
committerAlvaro Videla <videlalvaro@gmail.com>2015-10-06 16:29:38 +0200
commit4eff6cf0cb5b08ba829b20aa1a95f6f87f9c7c05 (patch)
tree723b8d849be43b320751cc7c6959fdbfab634a56 /src
parentb0d5818c584383fb1a90e14d6975c52b8b771435 (diff)
parent3a08998fcf7977d43c0645b8c6bf6a62382c9eee (diff)
downloadrabbitmq-server-git-4eff6cf0cb5b08ba829b20aa1a95f6f87f9c7c05.tar.gz
Merge branch 'stable'
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_error_logger_file_h.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_error_logger_file_h.erl b/src/rabbit_error_logger_file_h.erl
index 0758a98484..f8166bfcd1 100644
--- a/src/rabbit_error_logger_file_h.erl
+++ b/src/rabbit_error_logger_file_h.erl
@@ -37,10 +37,10 @@
%% extracted from error_logger_file_h. See comment above.
get_depth() ->
case application:get_env(kernel, error_logger_format_depth) of
- {ok, Depth} when is_integer(Depth) ->
- max(10, Depth);
- undefined ->
- unlimited
+ {ok, Depth} when is_integer(Depth) ->
+ erlang:max(10, Depth);
+ undefined ->
+ unlimited
end.
-define(ERTS_NEW_LOGGER_STATE, "7.1").