From 89c15d31f45eacdb99dea8be087cc5d3ba466e9c Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Thu, 24 Jul 2025 10:25:47 +0900 Subject: [PATCH] =?UTF-8?q?[=EB=B0=B0=EC=B9=98]=20hostName=20->=20ip?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD,=20batch=5Fcheck=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20create=5Fat,=20created=5Fip=20=EC=B9=BC?= =?UTF-8?q?=EB=9F=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/batch/BatchLogRunner.java | 23 ++++++------- .../ports/application/BatchCheckService.java | 21 ++++++------ .../application/domain/BatchCheckOutCmd.java | 1 + .../adapters/persistence/BatchLogDao.java | 12 +++---- .../adapters/persistence/BatchLogMapper.java | 4 +-- .../batchLog/ports/BatchLogPortIn.java | 6 ++-- .../batchLog/ports/BatchLogPortOut.java | 6 ++-- .../ports/application/BatchLogService.java | 12 +++---- .../ports/application/domain/BatchLogCmd.java | 2 +- .../adapters/web/AutoSchedulesController.java | 32 +++++++++---------- .../mappers/batchCheck/BatchCheckMapper.xml | 6 ++-- .../mappers/batchLog/BatchLogMapper.xml | 10 +++--- .../resources/sql/data/04_second_open.sql | 12 ++++--- 13 files changed, 77 insertions(+), 70 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java index 59063baf..29bc9f56 100644 --- a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java +++ b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java @@ -3,6 +3,7 @@ package app.module.admin.config.application.batch; import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.core.config.application.logging.SafeLogger; +import java.net.InetAddress; import java.net.UnknownHostException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -23,25 +24,25 @@ public class BatchLogRunner { return; } - String hostName; - try { - hostName = java.net.InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { - hostName = "UNKNOWN"; - safeLogger.warn("호스트 이름 조회 실패", e); - } - // dev 환경 + 실제 날짜에 실행 로그 insert (RUNNING) - Long logId = batchLogPortIn.create(batchType, hostName, "RUNNING"); + Long logId = batchLogPortIn.create(batchType, getIpAddress(), "RUNNING"); try { action.run(); // 성공 처리 - batchLogPortIn.update(logId, hostName,"SUCCESS", null); + batchLogPortIn.update(logId, getIpAddress(),"SUCCESS", null); } catch (Exception e) { // 실패 처리 - batchLogPortIn.update(logId, hostName,"FAIL", e.getMessage()); + batchLogPortIn.update(logId, getIpAddress(),"FAIL", e.getMessage()); safeLogger.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e); } } + + private String getIpAddress() { + try { + return InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + return "unknown"; + } + } } diff --git a/admin/src/main/java/app/module/admin/usecase/batchCheck/ports/application/BatchCheckService.java b/admin/src/main/java/app/module/admin/usecase/batchCheck/ports/application/BatchCheckService.java index 17cb8551..634d801b 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchCheck/ports/application/BatchCheckService.java +++ b/admin/src/main/java/app/module/admin/usecase/batchCheck/ports/application/BatchCheckService.java @@ -3,6 +3,7 @@ package app.module.admin.usecase.batchCheck.ports.application; import app.module.admin.usecase.batchCheck.ports.application.domain.BatchCheckInCmd; import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; import java.net.InetAddress; +import java.net.UnknownHostException; import lombok.RequiredArgsConstructor; import app.module.admin.usecase.batchCheck.ports.application.domain.BatchCheckOutCmd; import app.module.admin.usecase.batchCheck.ports.BatchCheckPortIn; @@ -21,30 +22,30 @@ class BatchCheckService implements BatchCheckPortIn { @Override public boolean operate(BatchCheckInCmd inCmd) { try { - portOut.operate(new BatchCheckOutCmd(inCmd.getType(), inCmd.getRunDate())); + portOut.operate(new BatchCheckOutCmd(inCmd.getType(), inCmd.getRunDate(), getIpAddress())); return true; } catch (DuplicateKeyException e) { - log.warn("{} 가 이미 실행 중입니다. 중복 실행을 건너뜁니다.", inCmd.getMethodName()); + log.warn("[batch] {} 가 이미 실행 중입니다. 중복 실행을 건너뜁니다.", inCmd.getMethodName()); - batchLogPortIn.createError(inCmd.getType(), getHostName(), "WARNING", - inCmd.getMethodName() + " 가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + batchLogPortIn.createError(inCmd.getType(), getIpAddress(), "WARNING", + "[batch]" + inCmd.getMethodName() + " 가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); return false; } catch (Exception e) { - log.error("중복 실행 체크 예외 발생 : {} / {}", inCmd.getMethodName(), e.getMessage(), e); + log.error("[batch] 중복 실행 체크 예외 발생 : {} / {}", inCmd.getMethodName(), e.getMessage(), e); - batchLogPortIn.createError(inCmd.getType(), getHostName(), "ERROR", - inCmd.getMethodName() + " 중복 체크 중 예외 발생: " + e.getMessage()); + batchLogPortIn.createError(inCmd.getType(), getIpAddress(), "ERROR", + "[batch]" + inCmd.getMethodName() + " 중복 체크 중 예외 발생: " + e.getMessage()); return false; } } - private String getHostName() { + private String getIpAddress() { try { - return InetAddress.getLocalHost().getHostName(); - } catch (Exception e) { + return InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { return "unknown"; } } diff --git a/admin/src/main/java/app/module/admin/usecase/batchCheck/ports/application/domain/BatchCheckOutCmd.java b/admin/src/main/java/app/module/admin/usecase/batchCheck/ports/application/domain/BatchCheckOutCmd.java index b1ed9d60..321f0291 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchCheck/ports/application/domain/BatchCheckOutCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/batchCheck/ports/application/domain/BatchCheckOutCmd.java @@ -14,4 +14,5 @@ import lombok.Setter; public class BatchCheckOutCmd { private BatchLogType type; private Date runDate; + private String ip; } 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 7c58a0a3..ff019d54 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 @@ -19,19 +19,19 @@ class BatchLogDao implements BatchLogPortOut { } @Override - public Long create(BatchLogType type, String hostName, String status) { - BatchLogCmd cmd = new BatchLogCmd(null, type.name(), status, LocalDateTime.now(), hostName); + public Long create(BatchLogType type, String ip, String status) { + BatchLogCmd cmd = new BatchLogCmd(null, type.name(), status, ip, LocalDateTime.now()); mapper.create(cmd); return cmd.getId(); } @Override - public void createError(BatchLogType type, String hostName, String status, String errorMessage) { - mapper.createError(type.name(), hostName, status, errorMessage); + public void createError(BatchLogType type, String ip, String status, String errorMessage) { + mapper.createError(type.name(), ip, status, errorMessage); } @Override - public void update(Long id, String hostName, String status, String errorMessage) { - mapper.update(id, hostName, status, errorMessage); + public void update(Long id, String ip, String status, String errorMessage) { + mapper.update(id, ip, status, errorMessage); } } \ No newline at end of file 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 b819d7b6..efc2027a 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,6 +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 hostName, String status, String errorMessage); + Long createError(String type, String ip, String status, String errorMessage); + void update(Long id, String ip, 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 ec82205b..baa023d2 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 @@ -4,7 +4,7 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortIn { boolean exists(BatchLogType type); - Long create(BatchLogType type, String hostName, String status); - void createError(BatchLogType type, String hostName, String status, String errorMessage); - void update(Long id, String hostName, String status, String errorMessage); + Long create(BatchLogType type, String ip, String status); + void createError(BatchLogType type, String ip, String status, String errorMessage); + void update(Long id, String ip, 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 a46cbe30..7a07d8b4 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 @@ -4,7 +4,7 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortOut { boolean exists(BatchLogType type); - Long create(BatchLogType type, String hostName, String status); - void createError(BatchLogType type, String hostName, String status, String errorMessage); - void update(Long id, String hostName, String status, String errorMessage); + Long create(BatchLogType type, String ip, String status); + void createError(BatchLogType type, String ip, String status, String errorMessage); + void update(Long id, String ip, 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 91ba4e50..d377556c 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 @@ -17,17 +17,17 @@ class BatchLogService implements BatchLogPortIn { } @Override - public Long create(BatchLogType type, String hostName, String status) { - return portOut.create(type, hostName, status); + public Long create(BatchLogType type, String ip, String status) { + return portOut.create(type, ip, status); } @Override - public void createError(BatchLogType type, String hostName, String status, String errorMessage) { - portOut.createError(type, hostName, status, errorMessage); + public void createError(BatchLogType type, String ip, String status, String errorMessage) { + portOut.createError(type, ip, status, errorMessage); } @Override - public void update(Long id, String hostName, String status, String errorMessage) { - portOut.update(id, hostName, status, errorMessage); + public void update(Long id, String ip, String status, String errorMessage) { + portOut.update(id, ip, status, errorMessage); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java index 9fa1046c..be9e600a 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java @@ -15,6 +15,6 @@ public class BatchLogCmd { private Long id; private String type; private String status; + private String ip; private LocalDateTime startAt; - private String hostName; } 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 8e30a0b0..27d77951 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 @@ -37,7 +37,7 @@ public class AutoSchedulesController { String methodName = "fetchMonthlyStatus"; if (!schedulerEnabled) { - log.info("{} 는 local 환경에서는 실행되지 않습니다. (현재: {})", methodName, activeProfiles); + log.info("[batch] {} 는 {} 환경에서는 실행되지 않습니다.", methodName, activeProfiles); return; } @@ -48,16 +48,16 @@ public class AutoSchedulesController { } try { - log.info("스케줄 실행 : {} / {} / {} / {} / {}", - methodName, java.net.InetAddress.getLocalHost().getHostName(), this, + log.info("[batch] 스케줄 실행 : {} / {} / {} / {} / {}", + methodName, java.net.InetAddress.getLocalHost().getHostAddress(), this, +System.identityHashCode(this), Thread.currentThread().getName()); // 월별입력상태 실행 portIn.operate(); } catch (Exception e) { - log.error("예외 발생 : {} / {}", methodName, e.getMessage(), e); + log.error("[batch] 예외 발생 : {} / {}", methodName, e.getMessage(), e); } finally { - log.info("스케줄 종료 : {}", methodName); + log.info("[batch] 스케줄 종료 : {}", methodName); } } @@ -65,12 +65,12 @@ public class AutoSchedulesController { * 문자자동발송 등록 * 매일 오후 5시 마다 실행되는 스케줄러 */ - @Scheduled(cron = "0 0 18 * * ?") + @Scheduled(cron = "0 0 17 * * ?") public void fetchSmsAutoSend() { String methodName = "fetchSmsAutoSend"; if (!schedulerEnabled) { - log.info("{} 는 local 환경에서는 실행되지 않습니다. (현재: {})", methodName, activeProfiles); + log.info("[batch] {} 는 {} 환경에서는 실행되지 않습니다.", methodName, activeProfiles); return; } @@ -81,16 +81,16 @@ public class AutoSchedulesController { } try { - log.info("스케줄 실행 : {} / {} / {} / {} / {}", - methodName, java.net.InetAddress.getLocalHost().getHostName(), this, + log.info("[batch] 스케줄 실행 : {} / {} / {} / {} / {}", + methodName, java.net.InetAddress.getLocalHost().getHostAddress(), this, +System.identityHashCode(this), Thread.currentThread().getName()); // 문자자동발송 실행 portIn.sendAutoSms(); } catch (Exception e) { - log.error("예외 발생 : {} / {}", methodName, e.getMessage(), e); + log.error("[batch] 예외 발생 : {} / {}", methodName, e.getMessage(), e); } finally { - log.info("스케줄 종료 : {}", methodName); + log.info("[batch] 스케줄 종료 : {}", methodName); } } @@ -103,7 +103,7 @@ public class AutoSchedulesController { String methodName = "fetchMonthlyCarryOver"; if (!schedulerEnabled) { - log.info("{} 는 local 환경에서는 실행되지 않습니다. (현재: {})", methodName, activeProfiles); + log.info("[batch] {} 는 {} 환경에서는 실행되지 않습니다.", methodName, activeProfiles); return; } @@ -114,16 +114,16 @@ public class AutoSchedulesController { } try { - log.info("스케줄 실행 : {} / {} / {} / {} / {}", - methodName, java.net.InetAddress.getLocalHost().getHostName(), this, + log.info("[batch] 스케줄 실행 : {} / {} / {} / {} / {}", + methodName, java.net.InetAddress.getLocalHost().getHostAddress(), this, +System.identityHashCode(this), Thread.currentThread().getName()); // 월초이월금 실행 portIn.monthlyCarryOver(); } catch (Exception e) { - log.error("예외 발생 : {} / {}", methodName, e.getMessage(), e); + log.error("[batch] 예외 발생 : {} / {}", methodName, e.getMessage(), e); } finally { - log.info("스케줄 종료 : {}", methodName); + log.info("[batch] 스케줄 종료 : {}", methodName); } } } diff --git a/admin/src/main/resources/mappers/batchCheck/BatchCheckMapper.xml b/admin/src/main/resources/mappers/batchCheck/BatchCheckMapper.xml index 63929089..69be664d 100644 --- a/admin/src/main/resources/mappers/batchCheck/BatchCheckMapper.xml +++ b/admin/src/main/resources/mappers/batchCheck/BatchCheckMapper.xml @@ -2,8 +2,8 @@ - /* create : 배치 실행 여부 등록 */ - INSERT INTO batch_check(type, run_date) - VALUES (#{type}, #{runDate}) + /* create : 배치 중복 실행 방지를 위한 등록 */ + INSERT INTO batch_check(type, run_date, created_ip, created_at) + VALUES (#{type}, #{runDate}, #{ip}, now()) \ No newline at end of file diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml index aca26ca4..4d7024e7 100644 --- a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml +++ b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml @@ -19,8 +19,8 @@ SELECT nextval('batch_log_seq') - INSERT INTO batch_log (id, type, status, start_at, created_at, created_host) - VALUES (#{id}, #{type}, #{status}, #{startAt}, now(), #{hostName}) + INSERT INTO batch_log (id, type, status, start_at, created_at, created_ip) + VALUES (#{id}, #{type}, #{status}, #{startAt}, now(), #{ip}) @@ -29,8 +29,8 @@ 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}) + INSERT INTO batch_log (id, type, status, error_message, start_at, created_at, created_ip) + VALUES (#{id}, #{type}, #{status}, #{errorMessage}, now(), now(), #{ip}) @@ -39,7 +39,7 @@ SET status = #{status}, error_message = #{errorMessage}, end_at = now(), - created_host = #{hostName} + created_ip = #{ip} WHERE id = #{id} \ No newline at end of file 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 a9d4652f..2584475a 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -415,7 +415,7 @@ CREATE TABLE batch_log ( end_at TIMESTAMP, error_message VARCHAR(2000), created_at TIMESTAMP DEFAULT now(), - created_host VARCHAR(100), + created_ip VARCHAR(50), CONSTRAINT batch_log_pkey PRIMARY KEY (id) ); @@ -427,7 +427,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'; +COMMENT ON COLUMN batch_log.created_ip IS '생성 IP'; @@ -435,8 +435,10 @@ COMMENT ON COLUMN batch_log.created_host IS '생성HOST'; -- 배치 실행 여부 -- ==================================================================================================================== CREATE TABLE batch_check ( - type VARCHAR(50) NOT NULL, - run_date DATE NOT NULL, + type VARCHAR(50) NOT NULL, + run_date DATE NOT NULL, + created_ip VARCHAR(50) NOT NULL, + created_at TIMESTAMP DEFAULT now(), PRIMARY KEY (type, run_date) ); @@ -444,6 +446,8 @@ COMMENT ON TABLE batch_check IS '배치 실행 여부 테이블'; COMMENT ON COLUMN batch_check.type IS '배치 타입'; COMMENT ON COLUMN batch_check.run_date IS '배치 실행 날짜'; +COMMENT ON COLUMN batch_check.created_ip IS '실행 IP'; +COMMENT ON COLUMN batch_check.created_at IS '생성일';