Browse Source

更新 log appender 的配置

reghao 2 years ago
parent
commit
2995ed327c

+ 20 - 7
manager/src/main/java/cn/reghao/devops/manager/config/spring/AppLifecycle.java

@@ -41,9 +41,9 @@ public class AppLifecycle implements ApplicationRunner, DisposableBean {
 
     @Override
     public void run(ApplicationArguments args) {
+        initLogConfig();
         initBuildDir();
         initRoles();
-        initLogConfig();
         log.info("devops-manager 初始化完成");
     }
 
@@ -53,6 +53,25 @@ public class AppLifecycle implements ApplicationRunner, DisposableBean {
         log.info("Manager 停止");
     }
 
+    private void initLogConfig() {
+        String app = "devops-manager";
+        String host = "devops.reghao.cn";
+        LoggerConfig.initLogger(List.of(
+                Appenders.pushAppender(app, host, logHandler),
+                Appenders.consoleAppender()));
+
+        /*String env = System.getProperty("spring.profiles.active");
+        if ("dev".equals(env)) {
+            LoggerConfig.initLogger(List.of(
+                    Appenders.pushAppender(app, host, logHandler),
+                    Appenders.consoleAppender()));
+        } else {
+            LoggerConfig.initLogger(List.of(
+                    Appenders.pushAppender(app, host, logHandler),
+                    Appenders.fileAppender()));
+        }*/
+    }
+
     private void initBuildDir() {
         log.info("初始化本地构建目录");
         BuildDir buildDir = buildDirService.get(Machine.ID);
@@ -79,10 +98,4 @@ public class AppLifecycle implements ApplicationRunner, DisposableBean {
         
         return list;
     }
-
-    private void initLogConfig() {
-        String app = "devops-manager";
-        String host = "devops.reghao.cn";
-        LoggerConfig.initLogger(List.of(Appenders.pushAppender(app, host, logHandler)));
-    }
 }

+ 1 - 9
manager/src/main/java/cn/reghao/devops/manager/log/LoggerConfig.java

@@ -35,18 +35,10 @@ public class LoggerConfig {
         appenders.forEach(rootLogger::addAppender);
     }
 
-    public static void initLogger(Appender<ILoggingEvent> appender) {
+    public static void initLogger() {
         String env = System.getProperty("spring.profiles.active");
         if (!"dev".equals(env)) {
             // TODO 非 dev 环境则禁止日志写入 console
         }
-
-        Logger rootLogger = loggerContext.getLogger("ROOT");
-        // 停用当前的所有 appender
-        rootLogger.detachAndStopAllAppenders();
-
-        rootLogger.setAdditive(false);
-        rootLogger.setLevel(Level.INFO);
-        rootLogger.addAppender(appender);
     }
 }