From: Christophe Romain <christophe.romain@process-one.net>
Date: Thu, 22 Jan 2015 11:40:27 +0000 (+0100)
Subject: Fix integer parameter which can be set to 0
X-Git-Tag: 15.02~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4d17d939d407ca7d6ab60c1bc59486b1e5064a2;p=ejabberd

Fix integer parameter which can be set to 0
---

diff --git a/src/ejabberd_logger.erl b/src/ejabberd_logger.erl
index 0612bb379..59beca16d 100644
--- a/src/ejabberd_logger.erl
+++ b/src/ejabberd_logger.erl
@@ -61,9 +61,9 @@ get_log_path() ->
 
 -ifdef(LAGER).
 
-get_pos_integer_env(Name, Default) ->
+get_integer_env(Name, Default) ->
     case application:get_env(ejabberd, Name) of
-        {ok, I} when is_integer(I), I>0 ->
+        {ok, I} when is_integer(I), I>=0 ->
             I;
         undefined ->
             Default;
@@ -73,7 +73,7 @@ get_pos_integer_env(Name, Default) ->
                                    [Name, Junk, Default]),
             Default
     end.
-get_pos_string_env(Name, Default) ->
+get_string_env(Name, Default) ->
     case application:get_env(ejabberd, Name) of
         {ok, L} when is_list(L) ->
             L;
@@ -94,10 +94,10 @@ start() ->
     Dir = filename:dirname(ConsoleLog),
     ErrorLog = filename:join([Dir, "error.log"]),
     CrashLog = filename:join([Dir, "crash.log"]),
-    LogRotateDate = get_pos_string_env(log_rotate_date, ""),
-    LogRotateSize = get_pos_integer_env(log_rotate_size, 10*1024*1024),
-    LogRotateCount = get_pos_integer_env(log_rotate_count, 1),
-    LogRateLimit = get_pos_integer_env(log_rate_limit, 100),
+    LogRotateDate = get_string_env(log_rotate_date, ""),
+    LogRotateSize = get_integer_env(log_rotate_size, 10*1024*1024),
+    LogRotateCount = get_integer_env(log_rotate_count, 1),
+    LogRateLimit = get_integer_env(log_rate_limit, 100),
     application:set_env(lager, error_logger_hwm, LogRateLimit),
     application:set_env(
       lager, handlers,