From 77d1ca41f507c3859981484f8d9ab83a6bf7d2cd Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Fri, 30 May 2025 18:19:29 +0900 Subject: [PATCH] =?UTF-8?q?=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0=E3=81=AE?= =?UTF-8?q?=E3=83=90=E3=83=AA=E3=83=87=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/environment/mst_inst_all_environment.py | 3 +++ ecs/jskult-batch/src/batch/mst_inst_all.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ecs/jskult-batch/src/batch/environment/mst_inst_all_environment.py b/ecs/jskult-batch/src/batch/environment/mst_inst_all_environment.py index 0dcf9ece..51dbd081 100644 --- a/ecs/jskult-batch/src/batch/environment/mst_inst_all_environment.py +++ b/ecs/jskult-batch/src/batch/environment/mst_inst_all_environment.py @@ -9,6 +9,7 @@ class MstInstAllEnvironment(JskultBatchEnvironment): def __init__(self): self.JSKULT_BACKUP_BUCKET = environment.JSKULT_BACKUP_BUCKET self.BATCH_MANAGE_DYNAMODB_TABLE_NAME = environment.BATCH_MANAGE_DYNAMODB_TABLE_NAME + self.BATCH_EXECUTION_ID = environment.BATCH_EXECUTION_ID self.MAX_RUN_COUNT = environment.MAX_RUN_COUNT self.PROCESS_NAME = environment.PROCESS_NAME self.TRANSFER_RESULT_FOLDER = environment.TRANSFER_RESULT_FOLDER @@ -26,6 +27,8 @@ class MstInstAllEnvironment(JskultBatchEnvironment): self.JSKULT_BACKUP_BUCKET, 'JSKULT_BACKUP_BUCKET') super()._assert_variable_not_empty(self.BATCH_MANAGE_DYNAMODB_TABLE_NAME, 'BATCH_MANAGE_DYNAMODB_TABLE_NAME') + super()._assert_variable_not_empty( + self.BATCH_EXECUTION_ID, 'BATCH_EXECUTION_ID') super()._assert_variable_is_int(self.MAX_RUN_COUNT, 'MAX_RUN_COUNT') # MAX_RUN_COUNTは数値として扱うため、検査後に変換 self.MAX_RUN_COUNT = int(self.MAX_RUN_COUNT) diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index 33e3f6fe..e5bf9db8 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -37,7 +37,7 @@ class MstInstAll(JskultBatchEntrypoint): jskult_hdke_tbl_manager = JskultHdkeTblManager() jskult_batch_run_manager = JskultBatchRunManager( self.environment.BATCH_MANAGE_DYNAMODB_TABLE_NAME, - self.environment.BATCH_BATCH_EXECUTION_ID) + self.environment.BATCH_EXECUTION_ID) if not jskult_hdke_tbl_manager.can_run_process(): logger.error( '日次バッチ処理中またはdump取得が正常終了していないため、メルク施設マスタ作成処理を終了します。')