From c380f1dfe340a3143ea5891d81ca0a0cbe3e65d3 Mon Sep 17 00:00:00 2001
From: *lcOeIaePm0 <x.hasako.y@nds-tyo.co.jp>
Date: Mon, 30 May 2022 21:11:43 +0900
Subject: [PATCH] =?UTF-8?q?fix:SAP=E3=83=87=E3=83=BC=E3=82=BF=E6=9C=88?=
 =?UTF-8?q?=E6=AC=A1I/F=E5=8F=97=E9=A0=98=E9=80=9A=E7=9F=A5=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=20=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=BE=E3=83=BC?=
 =?UTF-8?q?=E3=83=B3=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=80=80=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB?=
 =?UTF-8?q?=E3=81=AE=E6=94=B9=E8=A1=8C=E3=82=B3=E3=83=BC=E3=83=89=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4=E3=80=80=E3=83=88=E3=83=AC=E3=83=BC=E3=82=B9=E3=83=90?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=81=AE=E5=87=BA=E5=8A=9B=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...staging-lambda-sap-fin-monthly-data-notice-daily.py | 10 +++++++++-
 ...staging-lambda-sap-sup-monthly-data-notice-daily.py | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-fin-monthly-data-notice-daily.py b/lambda/mbj-newdwh2021-staging-lambda-sap-fin-monthly-data-notice-daily.py
index bb394f3b..236091dd 100644
--- a/lambda/mbj-newdwh2021-staging-lambda-sap-fin-monthly-data-notice-daily.py
+++ b/lambda/mbj-newdwh2021-staging-lambda-sap-fin-monthly-data-notice-daily.py
@@ -6,6 +6,8 @@ import re
 import csv
 import logging
 from abc import *
+from zoneinfo import ZoneInfo
+import traceback
 
 # 環境変数
 CONFIG_BUCKET_NAME = os.environ["CONFIG_BUCKET_NAME"]
@@ -32,10 +34,13 @@ sns_client = boto3.client('sns')
 
 # logger設定
 logger = logging.getLogger()
+def custome_time(*arg):
+    return datetime.datetime.now(ZoneInfo("Asia/Tokyo")).timetuple()
 formatter = logging.Formatter(
     '[%(levelname)s]\t%(asctime)s\t%(message)s\n',
     '%Y-%m-%d %H:%M:%S'
 )
+formatter.converter = custome_time
 for handler in logger.handlers:
     handler.setFormatter(formatter)
 
@@ -116,7 +121,7 @@ def lambda_handler(event, context):
             logger.info(f'I-05-07 メール送信指示をします　送信先トピック：{MBJ_SAP_NOTICE_TOPIC}')
             params = {
                 'TopicArn': MBJ_SAP_NOTICE_TOPIC,
-                'Subject': mail_title,
+                'Subject': mail_title.rstrip('\n'),
                 'Message': mail_body
             }
             sns_client.publish(**params)
@@ -128,9 +133,11 @@ def lambda_handler(event, context):
         # ⑥ 処理終了ログを出力する
         logger.info('I-06-01 処理終了　SAP_finデータ月次I/F受領通知処理')
     except CustomException as e:
+        traceback.print_exc()
         error_notice(e.id, e.arg)
     except Exception as e:
         logger.error(f'E-99 想定外のエラーが発生しました　エラー内容：{e}')
+        traceback.print_exc()
         error_notice('E-99', e)
     return
 
@@ -148,6 +155,7 @@ def error_notice(error_log_id, exception) -> None:
         logger.error(f'E-ERR-01 処理異常通知の送信指示をしました　通知先トピック：{NDS_NOTICE_TOPIC}')
     except Exception as e:
         logger.error(f'E-98 処理異常通知の送信指示に失敗しました　エラー内容：{e}')
+        traceback.print_exc()
     return
 
 
diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-sup-monthly-data-notice-daily.py b/lambda/mbj-newdwh2021-staging-lambda-sap-sup-monthly-data-notice-daily.py
index e86b3e64..f4d1d1e7 100644
--- a/lambda/mbj-newdwh2021-staging-lambda-sap-sup-monthly-data-notice-daily.py
+++ b/lambda/mbj-newdwh2021-staging-lambda-sap-sup-monthly-data-notice-daily.py
@@ -6,6 +6,8 @@ import re
 import csv
 import logging
 from abc import *
+from zoneinfo import ZoneInfo
+import traceback
 
 # 環境変数
 CONFIG_BUCKET_NAME = os.environ["CONFIG_BUCKET_NAME"]
@@ -32,10 +34,13 @@ sns_client = boto3.client('sns')
 
 # logger設定
 logger = logging.getLogger()
+def custome_time(*arg):
+    return datetime.datetime.now(ZoneInfo("Asia/Tokyo")).timetuple()
 formatter = logging.Formatter(
     '[%(levelname)s]\t%(asctime)s\t%(message)s\n',
     '%Y-%m-%d %H:%M:%S'
 )
+formatter.converter = custome_time
 for handler in logger.handlers:
     handler.setFormatter(formatter)
 
@@ -116,7 +121,7 @@ def lambda_handler(event, context):
             logger.info(f'I-05-07 メール送信指示をします　送信先トピック：{MBJ_SAP_NOTICE_TOPIC}')
             params = {
                 'TopicArn': MBJ_SAP_NOTICE_TOPIC,
-                'Subject': mail_title,
+                'Subject': mail_title.rstrip('\n'),
                 'Message': mail_body
             }
             sns_client.publish(**params)
@@ -128,9 +133,11 @@ def lambda_handler(event, context):
         # ⑥ 処理終了ログを出力する
         logger.info('I-06-01 処理終了　SAP_supデータ月次I/F受領通知処理')
     except CustomException as e:
+        traceback.print_exc()
         error_notice(e.id, e.arg)
     except Exception as e:
         logger.error(f'E-99 想定外のエラーが発生しました　エラー内容：{e}')
+        traceback.print_exc()
         error_notice('E-99', e)
     return
 
@@ -148,6 +155,7 @@ def error_notice(error_log_id, exception) -> None:
         logger.error(f'E-ERR-01 処理異常通知の送信指示をしました　通知先トピック：{NDS_NOTICE_TOPIC}')
     except Exception as e:
         logger.error(f'E-98 処理異常通知の送信指示に失敗しました　エラー内容：{e}')
+        traceback.print_exc()
     return