浏览代码

update traceConfig fileName:sig-comm-server:sig-todp-server, reload application config:sig-etlp-server

shjung 9 月之前
父节点
当前提交
d6d055fa6c

+ 1 - 0
conf/sig-todp-server.pid

@@ -0,0 +1 @@
+2600

+ 1 - 1
ggits-comm-server/src/main/java/com/sig/ggits/comm/server/GgitsCommServerApplication.java

@@ -30,7 +30,7 @@ import java.util.Date;
 @ComponentScan(basePackages = {"com.its.common.spring", "com.sig.ggits.comm.server.config", "com.sig.ggits.comm.server"})
 public class GgitsCommServerApplication implements CommandLineRunner, ApplicationListener<ContextClosedEvent>, InitializingBean, DisposableBean {
 
-    private static final String APPLICATION_NAME = "ggits-comm-server";
+    public static final String APPLICATION_NAME = "ggits-comm-server";
 
     public static void main(String[] args) {
         SpringApplication application = new SpringApplicationBuilder()

+ 1 - 1
ggits-etlp-server/src/main/java/com/sig/ggits/etlp/server/GgitsEtlpServerApplication.java

@@ -26,7 +26,7 @@ import java.util.Date;
 @ComponentScan(basePackages = {"com.its.common.spring", "com.sig.ggits.etlp.server.config", "com.sig.ggits.etlp.server"})
 public class GgitsEtlpServerApplication implements CommandLineRunner, ApplicationListener<ContextClosedEvent>, InitializingBean, DisposableBean {
 
-    private static final String APPLICATION_NAME = "ggits-etlp-server";
+    public static final String APPLICATION_NAME = "ggits-etlp-server";
 
     public static void main(String[] args) {
         SpringApplication application = new SpringApplicationBuilder()

+ 22 - 0
ggits-etlp-server/src/main/java/com/sig/ggits/etlp/server/config/ApplicationConfig.java

@@ -1,11 +1,18 @@
 package com.sig.ggits.etlp.server.config;
 
+import com.sig.ggits.etlp.server.GgitsEtlpServerApplication;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
+import org.yaml.snakeyaml.Yaml;
 
 import javax.annotation.PostConstruct;
+import java.io.File;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Map;
 
 @Slf4j
 @Data
@@ -30,6 +37,21 @@ public class ApplicationConfig {
 
         log.info("[{}] -------------------------", this.getClass().getSimpleName());
         log.info("[{}]     pageCount: {}", this.getClass().getSimpleName(), this.pageCount);
+
+        reload();
     }
 
+    @SuppressWarnings("unchecked")
+    public void reload() {
+        String configFile = System.getProperty("user.dir") + File.separator + "conf" + File.separator + GgitsEtlpServerApplication.APPLICATION_NAME + ".yml";
+        Yaml yaml = new Yaml();
+        try (InputStream inputStream = Files.newInputStream(Paths.get(configFile))) {
+            Map<String, Object> obj = yaml.load(inputStream);
+            Map<String, Object> appConf = (Map<String, Object>) obj.get("application");
+            this.loggingHist = (boolean) appConf.get("logging-hist");
+        }
+        catch (Exception e) {
+            //log.error("ApplicationConfig.reload: Failed to load configuration file. {}", e.getMessage());
+        }
+    }
 }

+ 12 - 0
ggits-etlp-server/src/main/java/com/sig/ggits/etlp/server/scheduler/GgitsEtlpScheduler.java

@@ -1,6 +1,7 @@
 package com.sig.ggits.etlp.server.scheduler;
 
 import com.its.common.utils.Elapsed;
+import com.sig.ggits.etlp.server.config.ApplicationConfig;
 import com.sig.ggits.etlp.server.service.GgitsEtlpService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -17,6 +18,7 @@ import javax.annotation.PreDestroy;
 @Component
 public class GgitsEtlpScheduler {
 
+    private final ApplicationConfig config;
 //    private final UnitSystService unitSystService;
     private final GgitsEtlpService service;
 
@@ -57,4 +59,14 @@ public class GgitsEtlpScheduler {
         }
     }
 
+    @Async
+    @Scheduled(cron = "30 * * * * *")  // 1분주기 작업 실행
+    public void reloadConfig() {
+        try {
+            this.config.reload();
+        }
+        catch(Exception e) {
+            log.error("ApplicationScheduler.reloadConfig: Exception {}", e.getMessage());
+        }
+    }
 }

+ 1 - 1
sig-comm-server/src/main/java/com/sig/comm/server/SigCommServerApplication.java

@@ -30,7 +30,7 @@ import java.util.Date;
 @ComponentScan(basePackages = {"com.its.common.spring", "com.sig.comm.server.config", "com.sig.comm.server"})
 public class SigCommServerApplication implements CommandLineRunner, ApplicationListener<ContextClosedEvent>, InitializingBean, DisposableBean {
 
-    private static final String APPLICATION_NAME = "sig-comm-server";
+    public static final String APPLICATION_NAME = "sig-comm-server";
 
     public static void main(String[] args) {
         SpringApplication application = new SpringApplicationBuilder()

+ 4 - 2
sig-comm-server/src/main/java/com/sig/comm/server/config/TraceConfig.java

@@ -1,6 +1,7 @@
 package com.sig.comm.server.config;
 
 import com.its.common.utils.StringUtils;
+import com.sig.comm.server.SigCommServerApplication;
 import com.sig.comm.server.dto.IntDto;
 import com.sig.comm.server.dto.RegionCenter;
 import com.sig.comm.server.repository.ApplicationRepository;
@@ -11,6 +12,7 @@ import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,9 +30,9 @@ public class TraceConfig {
     private final ApplicationRepository repo;
 
     private Properties getProperties() {
-        String workingDir = System.getProperty("user.dir");
+        String traceFileName = System.getProperty("user.dir") + File.separator + "conf" + File.separator + SigCommServerApplication.APPLICATION_NAME + "-trace.cfg";
         try {
-            FileInputStream in = new FileInputStream(workingDir + "/conf/sig-comm-server-trace.cfg");
+            FileInputStream in = new FileInputStream(traceFileName);
             Properties props = new Properties();
             props.load(in);
             in.close();

+ 0 - 17
sig-consumer/src/main/java/com/sig/Main.java

@@ -1,17 +0,0 @@
-package com.sig;
-
-//TIP To <b>Run</b> code, press <shortcut actionId="Run"/> or
-// click the <icon src="AllIcons.Actions.Execute"/> icon in the gutter.
-public class Main {
-    public static void main(String[] args) {
-        //TIP Press <shortcut actionId="ShowIntentionActions"/> with your caret at the highlighted text
-        // to see how IntelliJ IDEA suggests fixing it.
-        System.out.printf("Hello and welcome!");
-
-        for (int i = 1; i <= 5; i++) {
-            //TIP Press <shortcut actionId="Debug"/> to start debugging your code. We have set one <icon src="AllIcons.Debugger.Db_set_breakpoint"/> breakpoint
-            // for you, but you can always add more by pressing <shortcut actionId="ToggleLineBreakpoint"/>.
-            System.out.println("i = " + i);
-        }
-    }
-}

+ 1 - 1
sig-todp-server/src/main/java/com/sig/todp/server/SigTodpServerApplication.java

@@ -28,7 +28,7 @@ import java.util.Date;
 @ComponentScan(basePackages = {"com.its.common.spring", "com.sig.todp.server.config", "com.sig.todp.server"})
 public class SigTodpServerApplication implements CommandLineRunner, ApplicationListener<ContextClosedEvent>, InitializingBean, DisposableBean {
 
-    private static final String APPLICATION_NAME = "sig-todp-server";
+    public static final String APPLICATION_NAME = "sig-todp-server";
 
     public static void main(String[] args) {
         SpringApplication application = new SpringApplicationBuilder()

+ 4 - 2
sig-todp-server/src/main/java/com/sig/todp/server/config/TraceConfig.java

@@ -1,6 +1,7 @@
 package com.sig.todp.server.config;
 
 import com.its.common.utils.StringUtils;
+import com.sig.todp.server.SigTodpServerApplication;
 import com.sig.todp.server.dto.RegionCenter;
 import com.sig.todp.server.dto.TTodInt;
 import com.sig.todp.server.repository.ApplicationRepository;
@@ -11,6 +12,7 @@ import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,9 +30,9 @@ public class TraceConfig {
     private final ApplicationRepository repo;
 
     private Properties getProperties() {
-        String workingDir = System.getProperty("user.dir");
+        String traceFileName = System.getProperty("user.dir") + File.separator + "conf" + File.separator + SigTodpServerApplication.APPLICATION_NAME + "-trace.cfg";
         try {
-            FileInputStream in = new FileInputStream(workingDir + "/conf/sig-todp-server-trace.cfg");
+            FileInputStream in = new FileInputStream(traceFileName);
             Properties props = new Properties();
             props.load(in);
             in.close();