Ensure Error caught in InitExecutor and do not exit when error occurs…

… in LogBase (alibaba#613) to avoid affecting normal logic of users Signed-off-by: Eric Zhao <[email protected]>
wangsj11050 · Mar 27, 2019 · d5204bb · d5204bb
1 parent 7f29773
commit d5204bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/init/InitExecutor.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/init/InitExecutor.java
@@ -50,16 +50,15 @@ public static void doInit() {
             }
             for (OrderWrapper w : initList) {
                 w.func.init();
-                RecordLog.info(String.format("[InitExecutor] Initialized: %s with order %d",
+                RecordLog.info(String.format("[InitExecutor] Executing %s with order %d",
                     w.func.getClass().getCanonicalName(), w.order));
             }
         } catch (Exception ex) {
-            RecordLog.warn("[InitExecutor] Init failed", ex);
+            RecordLog.warn("[InitExecutor] WARN: Initialization failed", ex);
             ex.printStackTrace();
         } catch (Error error) {
-            RecordLog.warn("[InitExecutor] Init failed with fatal error", error);
+            RecordLog.warn("[InitExecutor] ERROR: Initialization failed with fatal error", error);
             error.printStackTrace();
-            throw error;
         }
     }
 

diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/log/LogBase.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/log/LogBase.java
@@ -32,11 +32,15 @@
  * @author leyou
  */
 public class LogBase {
+
     public static final String LOG_CHARSET = "utf-8";
+
     private static final String DIR_NAME = "logs" + File.separator + "csp";
     private static final String USER_HOME = "user.home";
+
     public static final String LOG_DIR = "csp.sentinel.log.dir";
     public static final String LOG_NAME_USE_PID = "csp.sentinel.log.use.pid";
+
     private static boolean logNameUsePid = false;
 
     private static String logBaseDir;
@@ -45,8 +49,8 @@ public class LogBase {
         try {
             init();
         } catch (Throwable t) {
+            System.err.println("[LogBase] FATAL ERROR when initializing log class");
             t.printStackTrace();
-            System.exit(-1);
         }
     }