From a885f860adc50a8b2a14e749fd302a7390add8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 21 Jul 2025 10:21:15 +0900 Subject: [PATCH] =?UTF-8?q?[TEST]=20=EB=B0=B0=EC=B9=98=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=20=EC=8B=A4=ED=96=89=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/module/admin/AdminApplication.java | 2 - .../application/bean/SchedulingConfig.java | 21 +++++++ .../adapters/persistence/BatchLogDao.java | 5 ++ .../adapters/persistence/BatchLogMapper.java | 1 + .../batchLog/ports/BatchLogPortIn.java | 1 + .../batchLog/ports/BatchLogPortOut.java | 1 + .../ports/application/BatchLogService.java | 5 ++ .../adapters/web/AutoSchedulesController.java | 61 +++++++++++++++++-- .../mappers/batchLog/BatchLogMapper.xml | 10 +++ .../resources/sql/data/04_second_open.sql | 2 + 10 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/config/application/bean/SchedulingConfig.java diff --git a/admin/src/main/java/app/module/admin/AdminApplication.java b/admin/src/main/java/app/module/admin/AdminApplication.java index d50f82f3..f13eb49f 100644 --- a/admin/src/main/java/app/module/admin/AdminApplication.java +++ b/admin/src/main/java/app/module/admin/AdminApplication.java @@ -6,11 +6,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; -import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableCaching -@EnableScheduling @ComponentScan(basePackages = "app.module") public class AdminApplication extends SpringBootServletInitializer { diff --git a/admin/src/main/java/app/module/admin/config/application/bean/SchedulingConfig.java b/admin/src/main/java/app/module/admin/config/application/bean/SchedulingConfig.java new file mode 100644 index 00000000..d57ea0cf --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/bean/SchedulingConfig.java @@ -0,0 +1,21 @@ +package app.module.admin.config.application.bean; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + +@Configuration +@EnableScheduling +public class SchedulingConfig { + + @Bean + public ThreadPoolTaskScheduler taskScheduler() { + ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); + scheduler.setPoolSize(5); + scheduler.setThreadNamePrefix("scheduled-task-"); + scheduler.setWaitForTasksToCompleteOnShutdown(true); + scheduler.setAwaitTerminationSeconds(60); + return scheduler; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java index 6615ac8a..5c9dd44d 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java @@ -25,6 +25,11 @@ class BatchLogDao implements BatchLogPortOut { return cmd.getId(); } + @Override + public void createError(BatchLogType type, String hostName, String status, String errorMessage) { + mapper.createError(type.name(), hostName, status, errorMessage); + } + @Override public void update(Long id, String status, String errorMessage) { mapper.update(id, status, errorMessage); diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java index cf204385..08bf5530 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java @@ -7,5 +7,6 @@ import org.apache.ibatis.annotations.Mapper; public interface BatchLogMapper { boolean exists(String type); Long create(BatchLogCmd cmd); + Long createError(String type, String hostName, String status, String errorMessage); void update(Long id, String status, String errorMessage); } diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java index 1c2d1947..037d39dd 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java @@ -5,5 +5,6 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortIn { boolean exists(BatchLogType type); Long create(BatchLogType type); + void createError(BatchLogType type, String hostName, String status, String errorMessage); void update(Long id, String status, String errorMessage); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java index 916ff343..17410439 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java @@ -5,5 +5,6 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortOut { boolean exists(BatchLogType type); Long create(BatchLogType type); + void createError(BatchLogType type, String hostName, String status, String errorMessage); void update(Long id, String status, String errorMessage); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java index 426060aa..5a1054e1 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java @@ -21,6 +21,11 @@ class BatchLogService implements BatchLogPortIn { return portOut.create(type); } + @Override + public void createError(BatchLogType type, String hostName, String status, String errorMessage) { + portOut.createError(type, hostName, status, errorMessage); + } + @Override public void update(Long id, String status, String errorMessage) { portOut.update(id, status, errorMessage); diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java index 1d88c5da..7c46b1fd 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.web; +import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; @@ -10,9 +12,20 @@ import org.springframework.stereotype.Component; public class AutoSchedulesController { private final AutoSchedulesPortIn portIn; + private final BatchLogPortIn batchLogPortIn; + private final java.util.Set runningTasks = java.util.concurrent.ConcurrentHashMap.newKeySet(); - public AutoSchedulesController(AutoSchedulesPortIn portIn) { + public AutoSchedulesController(AutoSchedulesPortIn portIn, BatchLogPortIn batchLogPortIn) { this.portIn = portIn; + this.batchLogPortIn = batchLogPortIn; + } + + private boolean isAlreadyRunning(String lockKey) { + return !runningTasks.add(lockKey); + } + + private void releaseLock(String lockKey) { + runningTasks.remove(lockKey); } /** @@ -20,18 +33,30 @@ public class AutoSchedulesController { * 매 월 1일 0초 마다 실행되는 스케줄러 */ //@Scheduled(cron = "0 0 0 1 * *") - @Scheduled(cron = "1 0 0 19,20 * *") + @Scheduled(cron = "0 0 * * * *") public void fetchMonthlyStatus() { + String lockKey = "fetchMonthlyStatus_" + java.time.LocalDate.now(); try { - String host = java.net.InetAddress.getLocalHost().getHostName(); + // 중복 실행 방지를 위한 간단한 체크 + if (isAlreadyRunning(lockKey)) { + log.warn("fetchMonthlyStatus가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + + batchLogPortIn.createError(BatchLogType.MONTHLY_STATUS, host, "WARNING", "fetchMonthlyStatus가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + return; + } + log.info("스케줄 실행 : fetchMonthlyStatus / {} / {} / {} / {}", host, this, + System.identityHashCode(this), Thread.currentThread().getName()); portIn.operate(); } catch (Exception e) { log.error(e.getMessage(), e); + } finally { + log.info("스케줄 종료 : fetchMonthlyStatus / {}", lockKey); + + releaseLock(lockKey); } } @@ -41,16 +66,28 @@ public class AutoSchedulesController { */ @Scheduled(cron = "0 0 17 * * ?") public void fetchSmsAutoSend() { + String lockKey = "fetchSmsAutoSend" + java.time.LocalDate.now(); try { - String host = java.net.InetAddress.getLocalHost().getHostName(); + // 중복 실행 방지를 위한 간단한 체크 + if (isAlreadyRunning(lockKey)) { + log.warn("fetchSmsAutoSend 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + + batchLogPortIn.createError(BatchLogType.AUTO_SMS, host, "WARNING", "fetchSmsAutoSend 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + return; + } + log.info("스케줄 실행 : fetchSmsAutoSend / {} / {} / {} / {}", host, this, + System.identityHashCode(this), Thread.currentThread().getName()); portIn.sendAutoSms(); } catch (Exception e) { log.error(e.getMessage(), e); + } finally { + log.info("스케줄 종료 : fetchSmsAutoSend / {}", lockKey); + + releaseLock(lockKey); } } @@ -59,18 +96,30 @@ public class AutoSchedulesController { * 매월 16일 0시 0초에 실행되는 스케줄러 */ // @Scheduled(cron = "0 0 0 16 * *") - @Scheduled(cron = "0 0 0 19,20 * *") + @Scheduled(cron = "0 0 * * * *") public void fetchMonthlyCarryOver() { + String lockKey = "fetchMonthlyCarryOver_" + java.time.LocalDate.now(); try { - String host = java.net.InetAddress.getLocalHost().getHostName(); + // 중복 실행 방지를 위한 간단한 체크 + if (isAlreadyRunning(lockKey)) { + log.warn("fetchMonthlyCarryOver가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + + batchLogPortIn.createError(BatchLogType.CARRYOVER, host, "WARNING", "fetchMonthlyCarryOver가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + return; + } + log.info("스케줄 실행 : fetchMonthlyCarryOver / {} / {} / {} / {}", host, this, + System.identityHashCode(this), Thread.currentThread().getName()); portIn.monthlyCarryOver(); } catch (Exception e) { log.error(e.getMessage(), e); + } finally { + log.info("스케줄 종료 : fetchMonthlyCarryOver / {}", lockKey); + + releaseLock(lockKey); } } } diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml index cf760fd7..0749c805 100644 --- a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml +++ b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml @@ -23,6 +23,16 @@ VALUES (#{id}, #{type}, #{status}, #{startAt}, now()) + + + + SELECT nextval('batch_log_seq') + + + INSERT INTO batch_log (id, type, status, error_message, start_at, created_at, created_host) + VALUES (#{id}, #{type}, #{status}, #{errorMessage}, now(), now(), #{hostName}) + + UPDATE batch_log diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index f871d0fb..de8fc05b 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -401,6 +401,7 @@ CREATE TABLE batch_log ( end_at TIMESTAMP, error_message VARCHAR(2000), created_at TIMESTAMP DEFAULT now(), + created_host VARCHAR(100), CONSTRAINT batch_log_pkey PRIMARY KEY (id) ); @@ -412,6 +413,7 @@ COMMENT ON COLUMN batch_log.start_at IS '배치 시작 시간'; COMMENT ON COLUMN batch_log.end_at IS '배치 종료 시간'; COMMENT ON COLUMN batch_log.error_message IS '에러 메시지 (실패한 경우)'; COMMENT ON COLUMN batch_log.created_at IS '생성일'; +COMMENT ON COLUMN batch_log.created_host IS '생성HOST';