diff --git a/src/main/java/com/bsmlab/dfx/agent/config/DfxAgentConfiguration.java b/src/main/java/com/bsmlab/dfx/agent/config/DfxAgentConfiguration.java index a916a62..0460dd4 100644 --- a/src/main/java/com/bsmlab/dfx/agent/config/DfxAgentConfiguration.java +++ b/src/main/java/com/bsmlab/dfx/agent/config/DfxAgentConfiguration.java @@ -45,7 +45,7 @@ public class DfxAgentConfiguration { // agent 설정 관리자. 대부분의 기능에 필요함 @Bean(name = "agentConfigReader") - public AgentConfigReader agentConfigReader() { + public AgentConfigReader agentConfigReader() { // 실행확인됨 if(StringUtils.isBlank(this.settingFile)) { log.error("cannot found a setting file. {}", this.settingFile); log.error("exit application"); @@ -58,7 +58,7 @@ public class DfxAgentConfiguration { // 다중 데이터 소스 생성 @Bean(name = "dynamicRoutingDataSource") - public DynamicRoutingDataSource dynamicRoutingDataSource(AgentConfigReader agentConfigReader) { + public DynamicRoutingDataSource dynamicRoutingDataSource(AgentConfigReader agentConfigReader) { // 실행확인됨 DynamicRoutingDataSource dynamicRoutingDataSource = new DynamicRoutingDataSource(); Map sqlSessionFactoryMap = new HashMap<>(); Map transactionManagerMap = new HashMap<>(); @@ -118,7 +118,7 @@ public class DfxAgentConfiguration { // 다중 데이터 소스와 그에 해당하는 sqlSession, transactionManager 설정 @Bean(name = "dynamicDataSourceService") - public DynamicDataSourceService dynamicDataSourceService() { + public DynamicDataSourceService dynamicDataSourceService() { // 실행확인됨 DynamicDataSourceService dynamicDataSourceService = new DynamicDataSourceService(); dynamicDataSourceService.setSqlSessionFactoryMap(this.temporarySqlSessionFactoryMap); dynamicDataSourceService.setTransactionManagerMap(this.temporaryTransactionManagerMap); @@ -140,7 +140,7 @@ public class DfxAgentConfiguration { // (송신 처리) 메시지 송신 쓰레드 설정 @Bean(name = "scheduledPostmanThreadPoolTaskScheduler") - public ThreadPoolTaskScheduler scheduledPostmanThreadPoolTaskScheduler() { + public ThreadPoolTaskScheduler scheduledPostmanThreadPoolTaskScheduler() { // 실행확인됨 ThreadPoolTaskScheduler scheduledPostmanThreadPoolTaskScheduler = new ThreadPoolTaskScheduler(); scheduledPostmanThreadPoolTaskScheduler.setPoolSize(10); scheduledPostmanThreadPoolTaskScheduler.setThreadNamePrefix("postman-scheduler-"); diff --git a/src/main/java/com/bsmlab/dfx/agent/config/StartupRunner.java b/src/main/java/com/bsmlab/dfx/agent/config/StartupRunner.java index 8382470..eb55ee1 100644 --- a/src/main/java/com/bsmlab/dfx/agent/config/StartupRunner.java +++ b/src/main/java/com/bsmlab/dfx/agent/config/StartupRunner.java @@ -1,5 +1,7 @@ package com.bsmlab.dfx.agent.config; +import com.bsmlab.dfx.agent.task.dropbox.DropBoxTaskExecutorService; +import com.bsmlab.dfx.agent.task.postman.PostmanSchedulerService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; @@ -10,10 +12,16 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor @Component public class StartupRunner implements ApplicationRunner { + private final PostmanSchedulerService postmanSchedulerService; + private final DropBoxTaskExecutorService dropBoxTaskExecutorService; @Override public void run(ApplicationArguments args) throws Exception { - log.debug("run"); + // PostmanSchedulerService, DropBoxTaskExecutorService 는 @RequiredArgsConstructor 이기 때문에 자동으로 injection 된다 + // 그 후 @PostConstruct 로직이 실행될 것이다. + log.debug("StartupRunner start [run]"); + log.debug("{} ready", postmanSchedulerService.getClass().getName()); + log.debug("{} ready", dropBoxTaskExecutorService.getClass().getName()); //TODO 4. Worker 쓰레드 생성 } } diff --git a/src/main/java/com/bsmlab/dfx/agent/config/WebServerCustomizer.java b/src/main/java/com/bsmlab/dfx/agent/config/WebServerCustomizer.java index 9e91492..a385e9e 100644 --- a/src/main/java/com/bsmlab/dfx/agent/config/WebServerCustomizer.java +++ b/src/main/java/com/bsmlab/dfx/agent/config/WebServerCustomizer.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; public class WebServerCustomizer implements WebServerFactoryCustomizer { private final AgentConfigReader agentConfigReader; @Override - public void customize(ConfigurableServletWebServerFactory factory) { + public void customize(ConfigurableServletWebServerFactory factory) { // 실행확인됨 int port = agentConfigReader.getAgentConfigDto().getMyListenPort(); factory.setPort(port); factory.setContextPath(""); // context-path 가 "/" root일 때 ""로 입력하여야 함 diff --git a/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxTaskExecutorService.java b/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxTaskExecutorService.java index 8696513..4dac70d 100644 --- a/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxTaskExecutorService.java +++ b/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxTaskExecutorService.java @@ -152,7 +152,8 @@ public class DropBoxTaskExecutorService { } @PostConstruct - public void run() { + public void run() { // 실행확인됨 + log.debug("{} @PostConstruct Run", this.getClass().getName()); while(true) { try { Thread.sleep(10); diff --git a/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java b/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java index 1ee5448..39b3876 100644 --- a/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java +++ b/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java @@ -59,9 +59,11 @@ public class PostmanSchedulerService { } @PostConstruct - public void launch() { + public void launch() { // 실행확인됨 + log.debug("{} @PostConstruct Run", this.getClass().getName()); List postmanList = agentConfigReader.getScheduledTypePostmanList(); for(AgentConfigDto.Postman postman : postmanList) { + this.postmanMap.put(postman.getPostmanId(), postman); this.startPostman(postman.getPostmanId()); } } diff --git a/src/main/resources/application.properties.bak b/src/main/resources/application.properties.bak deleted file mode 100644 index 341ff9e..0000000 --- a/src/main/resources/application.properties.bak +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=DFX Agent diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt index aa334af..9fcd18d 100644 --- a/src/main/resources/banner.txt +++ b/src/main/resources/banner.txt @@ -1,10 +1,9 @@ - -ooo. ooooo o o .oo o -8 `8. 8 `b d' .P 8 8 -8 `8 o8oo `bd' .P 8 .oPYo. .oPYo. odYo. o8P -8 8 8 .PY. oPooo8 8 8 8oooo8 8' `8 8 -8 .P 8 .P Y. .P 8 8 8 8. 8 8 8 -8ooo' 8 .P Y. .P 8 `YooP8 `Yooo' 8 8 8 -.....:::..::::..::::..:::..:::::..:....8 :.....:..::..::..: -::::::::::::::::::::::::::::::::::::ooP'.:::::::::::::::::: -::::::::::::::::::::::::::::::::::::...:::::::::::::::::::: \ No newline at end of file + _______ __________ ___ ___ _______ _______ .__ __. .___________. +| \ | ____\ \ / / / \ / _____|| ____|| \ | | | | +| .--. || |__ \ V / / ^ \ | | __ | |__ | \| | `---| |----` +| | | || __| > < / /_\ \ | | |_ | | __| | . ` | | | +| '--' || | / . \ / _____ \ | |__| | | |____ | |\ | | | +|_______/ |__| /__/ \__\ /__/ \__\ \______| |_______||__| \__| |__| + +${application.title} ${application.version} +Powered by Spring Boot ${spring-boot.version} \ No newline at end of file