diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-fin-receive-check-daily.py b/lambda/mbj-newdwh2021-staging-lambda-sap-fin-receive-check-daily.py index 5dcff2ae..cedc103c 100644 --- a/lambda/mbj-newdwh2021-staging-lambda-sap-fin-receive-check-daily.py +++ b/lambda/mbj-newdwh2021-staging-lambda-sap-fin-receive-check-daily.py @@ -17,6 +17,7 @@ MBJ_SAP_NOTICE_TOPIC = os.environ["MBJ_SAP_NOTICE_TOPIC"] MAIL_BODY_REPLACE_SYMBOL = os.environ["MAIL_BODY_REPLACE_SYMBOL"] NDS_NOTICE_TOPIC = os.environ["NDS_NOTICE_TOPIC"] NDS_NOTICE_TITLE = os.environ["NDS_NOTICE_TITLE"] +LOG_LEVEL = os.environ["LOG_LEVEL"] # 定数 ROW_COMMENT_SYMBOL = '#' @@ -25,6 +26,7 @@ INDEX_DATA_NAME = 1 INDEX_ROW_COMMENT_SYMBOL = 0 INDEX_SPLIT_NUM = 1 INDEX_LAST = -1 + # メール本文に出力する不足ファイル名一覧のインデント MAIL_INDENT = '  ' @@ -35,14 +37,17 @@ sns_client = boto3.client('sns') # logger設定 logger = logging.getLogger() -logger.setLevel(logging.INFO) formatter = logging.Formatter( - '[%(levelname)s]\t%(asctime)s.%(msecs)dZ\t%(message)s\n', + '[%(levelname)s]\t%(asctime)s\t%(message)s\n', '%Y-%m-%d %H:%M:%S' ) for handler in logger.handlers: handler.setFormatter(formatter) +level = logging.getLevelName(LOG_LEVEL) +if not isinstance(level, int): + level = logging.INFO +logger.setLevel(level) def lambda_handler(event, context): try: @@ -78,7 +83,7 @@ def lambda_handler(event, context): datetime.datetime.strptime(non_date, "%Y/%m/%d") except Exception as e: raise e - none_business_day_list .append(non_date) + none_business_day_list.append(non_date) if execute_date in none_business_day_list: logging.info('I-02-05 本日は非営業日のため、チェック処理をスキップします') return diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-sup-receive-check-daily.py b/lambda/mbj-newdwh2021-staging-lambda-sap-sup-receive-check-daily.py index 5c87970a..be82a7e4 100644 --- a/lambda/mbj-newdwh2021-staging-lambda-sap-sup-receive-check-daily.py +++ b/lambda/mbj-newdwh2021-staging-lambda-sap-sup-receive-check-daily.py @@ -17,6 +17,7 @@ MBJ_SAP_NOTICE_TOPIC = os.environ["MBJ_SAP_NOTICE_TOPIC"] MAIL_BODY_REPLACE_SYMBOL = os.environ["MAIL_BODY_REPLACE_SYMBOL"] NDS_NOTICE_TOPIC = os.environ["NDS_NOTICE_TOPIC"] NDS_NOTICE_TITLE = os.environ["NDS_NOTICE_TITLE"] +LOG_LEVEL = os.environ["LOG_LEVEL"] # 定数 ROW_COMMENT_SYMBOL = '#' @@ -25,6 +26,7 @@ INDEX_DATA_NAME = 1 INDEX_ROW_COMMENT_SYMBOL = 0 INDEX_SPLIT_NUM = 1 INDEX_LAST = -1 + # メール本文に出力する不足ファイル名一覧のインデント MAIL_INDENT = '  ' @@ -35,14 +37,17 @@ sns_client = boto3.client('sns') # logger設定 logger = logging.getLogger() -logger.setLevel(logging.INFO) formatter = logging.Formatter( - '[%(levelname)s]\t%(asctime)s.%(msecs)dZ\t%(message)s\n', + '[%(levelname)s]\t%(asctime)s\t%(message)s\n', '%Y-%m-%d %H:%M:%S' ) for handler in logger.handlers: handler.setFormatter(formatter) +level = logging.getLevelName(LOG_LEVEL) +if not isinstance(level, int): + level = logging.INFO +logger.setLevel(level) def lambda_handler(event, context): try: @@ -78,7 +83,7 @@ def lambda_handler(event, context): datetime.datetime.strptime(non_date, "%Y/%m/%d") except Exception as e: raise e - none_business_day_list .append(non_date) + none_business_day_list.append(non_date) if execute_date in none_business_day_list: logging.info('I-02-05 本日は非営業日のため、チェック処理をスキップします') return