From 4995164d3fa5e2995e7364104378a41057278568 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 16 Jun 2025 15:23:06 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0?= =?UTF-8?q?=E3=81=AE=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF=E4=B8=8D=E5=82=99?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=E4=BE=8B=E5=A4=96=E3=81=8C?= =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=83=81=E3=81=A7=E3=81=8D=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=80=81Exception=E3=81=A7=E3=82=AD=E3=83=A3=E3=83=83=E3=83=81?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/dcf_inst_merge_io.py | 3 +-- ecs/jskult-batch/src/batch/mst_inst_all.py | 3 +-- ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py | 3 +-- ecs/jskult-batch/src/batch/update_business_day.py | 6 ++---- ecs/jskult-batch/src/system_var/environment.py | 2 ++ 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py b/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py index 88c3b6c7..06b28023 100644 --- a/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py +++ b/ecs/jskult-batch/src/batch/dcf_inst_merge_io.py @@ -9,7 +9,6 @@ from src.batch.environment.dcf_inst_merge_environment import \ from src.batch.jskult_batch_entrypoint import JskultBatchEntrypoint from src.db.database import Database from src.error.exceptions import (BatchOperationException, - EnvironmentVariableNotSetException, MaxRunCountReachedException) from src.logging.get_logger import get_logger from src.manager.jskult_batch_run_manager import JskultBatchRunManager @@ -29,7 +28,7 @@ class DcfInstMergeIO(JskultBatchEntrypoint): # 必須の環境変数が設定されていない場合、エラーにする try: self.environment.validate() - except EnvironmentVariableNotSetException as e: + except Exception as e: logger.exception(e) return diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index 9d1108a7..ddbbe6ea 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -6,7 +6,6 @@ from src.batch.environment.mst_inst_all_environment import \ from src.batch.jskult_batch_entrypoint import JskultBatchEntrypoint from src.db.database import Database from src.error.exceptions import (BatchOperationException, - EnvironmentVariableNotSetException, MaxRunCountReachedException) from src.logging.get_logger import get_logger from src.manager.jskult_batch_run_manager import JskultBatchRunManager @@ -25,7 +24,7 @@ class MstInstAll(JskultBatchEntrypoint): # 必須の環境変数が設定されていない場合、エラーにする try: self.environment.validate() - except EnvironmentVariableNotSetException as e: + except Exception as e: logger.exception(e) return diff --git a/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py b/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py index b8c3329d..fd11b913 100644 --- a/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py +++ b/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py @@ -6,7 +6,6 @@ from src.batch.environment.trn_result_data_bio_lot_environment import \ from src.batch.jskult_batch_entrypoint import JskultBatchEntrypoint from src.db.database import Database from src.error.exceptions import (BatchOperationException, - EnvironmentVariableNotSetException, MaxRunCountReachedException) from src.logging.get_logger import get_logger from src.manager.jskult_batch_run_manager import JskultBatchRunManager @@ -25,7 +24,7 @@ class TrnResultDataBioLot(JskultBatchEntrypoint): # 必須の環境変数が設定されていない場合、エラーにする try: self.environment.validate() - except EnvironmentVariableNotSetException as e: + except Exception as e: logger.exception(e) return diff --git a/ecs/jskult-batch/src/batch/update_business_day.py b/ecs/jskult-batch/src/batch/update_business_day.py index a1d1630b..de452040 100644 --- a/ecs/jskult-batch/src/batch/update_business_day.py +++ b/ecs/jskult-batch/src/batch/update_business_day.py @@ -3,14 +3,12 @@ import re from datetime import datetime import boto3 - from src.aws.s3 import ConfigBucket, JskTransferListBucket from src.batch.common.calendar_file import CalendarFile from src.batch.environment.update_business_day_environment import \ UpdateBusinessDayEnvironment from src.batch.jskult_batch_entrypoint import JskultBatchEntrypoint -from src.error.exceptions import (EnvironmentVariableNotSetException, - MaxRunCountReachedException) +from src.error.exceptions import MaxRunCountReachedException from src.logging.get_logger import get_logger from src.manager.jskult_batch_run_manager import JskultBatchRunManager from src.manager.jskult_batch_status_manager import JskultBatchStatusManager @@ -28,7 +26,7 @@ class UpdateBusinessDay(JskultBatchEntrypoint): # 必須の環境変数が設定されていない場合、エラーにする try: self.environment.validate() - except EnvironmentVariableNotSetException as e: + except Exception as e: logger.exception(e) return diff --git a/ecs/jskult-batch/src/system_var/environment.py b/ecs/jskult-batch/src/system_var/environment.py index 4dacb4e5..01fb8a38 100644 --- a/ecs/jskult-batch/src/system_var/environment.py +++ b/ecs/jskult-batch/src/system_var/environment.py @@ -35,6 +35,8 @@ JSKULT_CONFIG_EXPECTED_DATA_LIST_FILE_NAME = os.environ.get( JSK_IO_BUCKET = os.environ.get('JSK_IO_BUCKET', None) JSK_DATA_SEND_FOLDER = os.environ.get('JSK_DATA_SEND_FOLDER', None) JSK_BACKUP_FOLDER = os.environ.get('JSK_BACKUP_FOLDER', None) +DCF_INST_MERGE_SEND_FILE_NAME = os.environ.get( + 'DCF_INST_MERGE_SEND_FILE_NAME', None) # 初期値がある環境変数