nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #504 feature-NEWDWH2021-1921 into develop

Browse Source
This commit is contained in:
下田雅人 2025-06-16 16:05:46 +09:00
commit 7b35ca9e97
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ecs/jskult-batch/src/batch/dcf_inst_merge_io.py
View File

@ -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

3
ecs/jskult-batch/src/batch/mst_inst_all.py
View File

@ -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

3
ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py
View File

@ -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

6
ecs/jskult-batch/src/batch/update_business_day.py
View File

@ -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

2
ecs/jskult-batch/src/system_var/environment.py
View File

@ -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)
# 初期値がある環境変数