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 71e2ceb3..66c01350 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,12 +3,15 @@ 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.UnknownHostException; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor +@Slf4j public class BatchLogRunner { SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(BatchLogRunner.class)); @@ -21,16 +24,24 @@ public class BatchLogRunner { return; } + String hostName; + try { + hostName = java.net.InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + hostName = "UNKNOWN"; + log.warn("호스트 이름 조회 실패", e); + } + // 실행 로그 insert (RUNNING) - Long logId = batchLogPortIn.create(batchType); + Long logId = batchLogPortIn.create(batchType, hostName); try { action.run(); // 성공 처리 - batchLogPortIn.update(logId, "SUCCESS", null); + batchLogPortIn.update(logId, hostName,"SUCCESS", null); } catch (Exception e) { // 실패 처리 - batchLogPortIn.update(logId, "FAIL", e.getMessage()); + batchLogPortIn.update(logId, hostName,"FAIL", e.getMessage()); safeLogger.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e); } } 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 5c9dd44d..e60fa058 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,8 +19,8 @@ class BatchLogDao implements BatchLogPortOut { } @Override - public Long create(BatchLogType type) { - BatchLogCmd cmd = new BatchLogCmd(null, type.name(), "RUNNING", LocalDateTime.now()); + public Long create(BatchLogType type, String hostName) { + BatchLogCmd cmd = new BatchLogCmd(null, type.name(), "RUNNING", LocalDateTime.now(), hostName); mapper.create(cmd); return cmd.getId(); } @@ -31,7 +31,7 @@ class BatchLogDao implements BatchLogPortOut { } @Override - public void update(Long id, String status, String errorMessage) { - mapper.update(id, status, errorMessage); + public void update(Long id, String hostName, String status, String errorMessage) { + mapper.update(id, hostName, 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 08bf5530..b819d7b6 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 @@ -8,5 +8,5 @@ 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); + void update(Long id, String hostName, 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 037d39dd..f2d8b013 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); + Long create(BatchLogType type, String hostName); void createError(BatchLogType type, String hostName, String status, String errorMessage); - void update(Long id, String status, String errorMessage); + void update(Long id, String hostName, 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 17410439..f480fb86 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); + Long create(BatchLogType type, String hostName); void createError(BatchLogType type, String hostName, String status, String errorMessage); - void update(Long id, String status, String errorMessage); + void update(Long id, String hostName, 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 5a1054e1..9af233b0 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,8 +17,8 @@ class BatchLogService implements BatchLogPortIn { } @Override - public Long create(BatchLogType type) { - return portOut.create(type); + public Long create(BatchLogType type, String hostName) { + return portOut.create(type, hostName); } @Override @@ -27,7 +27,7 @@ class BatchLogService implements BatchLogPortIn { } @Override - public void update(Long id, String status, String errorMessage) { - portOut.update(id, status, errorMessage); + public void update(Long id, String hostName, String status, String errorMessage) { + portOut.update(id, hostName, 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 12899498..9fa1046c 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 @@ -16,4 +16,5 @@ public class BatchLogCmd { private String type; private String status; private LocalDateTime startAt; + private String hostName; } diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml index 0749c805..aca26ca4 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) - VALUES (#{id}, #{type}, #{status}, #{startAt}, now()) + INSERT INTO batch_log (id, type, status, start_at, created_at, created_host) + VALUES (#{id}, #{type}, #{status}, #{startAt}, now(), #{hostName}) @@ -38,7 +38,8 @@ UPDATE batch_log SET status = #{status}, error_message = #{errorMessage}, - end_at = now() + end_at = now(), + created_host = #{hostName} WHERE id = #{id} \ No newline at end of file