From 8d5ce56ec28e5917397144a26b664125c71c79a3 Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Fri, 3 Aug 2018 22:23:56 +0800
Subject: [PATCH] =?UTF-8?q?FileHandler.limit=E6=94=AF=E6=8C=81G/M/K?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/logging.properties                  |  4 ++--
 src/org/redkale/boot/LogFileHandler.java | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/conf/logging.properties b/conf/logging.properties
index 7035a2206..895431bc2 100644
--- a/conf/logging.properties
+++ b/conf/logging.properties
@@ -15,8 +15,8 @@ jdk.level = INFO
 
 java.util.logging.FileHandler.level = FINER
 #10M
-java.util.logging.FileHandler.limit = 10485760
-java.util.logging.FileHandler.count = 10000
+java.util.logging.FileHandler.limit = 10M
+java.util.logging.FileHandler.count = 20
 java.util.logging.FileHandler.encoding = UTF-8
 java.util.logging.FileHandler.pattern = ${APP_HOME}/logs-%m/log-%d.log
 java.util.logging.FileHandler.unusual = ${APP_HOME}/logs-%m/log-warnerr-%d.log
diff --git a/src/org/redkale/boot/LogFileHandler.java b/src/org/redkale/boot/LogFileHandler.java
index 87bb7f858..dfd203e03 100644
--- a/src/org/redkale/boot/LogFileHandler.java
+++ b/src/org/redkale/boot/LogFileHandler.java
@@ -241,7 +241,21 @@ public class LogFileHandler extends Handler {
         }
         String limitstr = manager.getProperty(cname + ".limit");
         try {
-            if (limitstr != null) this.limit = Math.abs(Integer.decode(limitstr));
+            if (limitstr != null) {
+                limitstr = limitstr.toUpperCase();
+                boolean g = limitstr.indexOf('G') > 0;
+                boolean m = limitstr.indexOf('M') > 0;
+                boolean k = limitstr.indexOf('K') > 0;
+                int ls = Math.abs(Integer.decode(limitstr.replace("G", "").replace("M", "").replace("K", "").replace("B", "")));
+                if (g) {
+                    ls *= 1024 * 1024 * 1024;
+                } else if (m) {
+                    ls *= 1024 * 1024;
+                } else if (k) {
+                    ls *= 1024;
+                }
+                this.limit = ls;
+            }
         } catch (Exception e) {
         }
         String countstr = manager.getProperty(cname + ".count");