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

refactor: リテラル値を定数化

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2022-07-02 16:58:29 +09:00
parent b33a3dae19
commit c19cf90a03
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lambda/check-view-secutiry-option/check-view-option/constants.py
View File

@ -1,8 +1,6 @@
# logger # logger
LOG_FORMAT = '[%(levelname)s]\t%(asctime)s\t%(message)s\n' LOG_FORMAT = '[%(levelname)s]\t%(asctime)s\t%(message)s\n'
LOG_DATE_FORMAT = '%Y-%m-%d %H:%M:%S' LOG_DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
DEFAULT_TIMEZONE = "Asia/Tokyo"
LOG_LEVEL = 'LOG_LEVEL'
LOG_LEVEL_INFO = 'INFO' LOG_LEVEL_INFO = 'INFO'
# environments # environments
@ -16,8 +14,10 @@ NOTICE_MAIL_TITLE_TEMPLATE_PATH = 'NOTICE_MAIL_TITLE_TEMPLATE_PATH'
PARAM_NAME_DB_HOST = 'PARAM_NAME_DB_HOST' PARAM_NAME_DB_HOST = 'PARAM_NAME_DB_HOST'
PARAM_NAME_DB_USER_NAME = 'PARAM_NAME_DB_USER_NAME' PARAM_NAME_DB_USER_NAME = 'PARAM_NAME_DB_USER_NAME'
PARAM_NAME_DB_USER_PASSWORD = 'PARAM_NAME_DB_USER_PASSWORD' PARAM_NAME_DB_USER_PASSWORD = 'PARAM_NAME_DB_USER_PASSWORD'
TZ = 'TZ'
# system var # system var
AWS_RESOURCE_S3 = 's3' AWS_RESOURCE_S3 = 's3'
S3_RESPONSE_BODY = 'Body' S3_RESPONSE_BODY = 'Body'
UTF8 = 'utf-8' UTF8 = 'utf-8'
LAUNCH_ON_LOCAL = 'local'

5
lambda/check-view-secutiry-option/check-view-option/environments.py
View File

@ -4,7 +4,8 @@ from constants import (CHECK_TARGET_SCHEMA_NAMES_PATH, CONFIG_BUCKET_NAME,
LOG_LEVEL, LOG_LEVEL_INFO, MBJ_NOTICE_TOPIC, LOG_LEVEL, LOG_LEVEL_INFO, MBJ_NOTICE_TOPIC,
NDS_NOTICE_TOPIC, NOTICE_MAIL_BODY_TEMPLATE_PATH, NDS_NOTICE_TOPIC, NOTICE_MAIL_BODY_TEMPLATE_PATH,
NOTICE_MAIL_TITLE_TEMPLATE_PATH, PARAM_NAME_DB_HOST, NOTICE_MAIL_TITLE_TEMPLATE_PATH, PARAM_NAME_DB_HOST,
PARAM_NAME_DB_USER_NAME, PARAM_NAME_DB_USER_PASSWORD) PARAM_NAME_DB_USER_NAME, PARAM_NAME_DB_USER_PASSWORD,
TZ)
LOG_LEVEL = os.environ.get(LOG_LEVEL, LOG_LEVEL_INFO) LOG_LEVEL = os.environ.get(LOG_LEVEL, LOG_LEVEL_INFO)
CHECK_TARGET_SCHEMA_NAMES_PATH = os.environ[CHECK_TARGET_SCHEMA_NAMES_PATH] CHECK_TARGET_SCHEMA_NAMES_PATH = os.environ[CHECK_TARGET_SCHEMA_NAMES_PATH]
@ -17,3 +18,5 @@ NOTICE_MAIL_TITLE_TEMPLATE_PATH = os.environ[NOTICE_MAIL_TITLE_TEMPLATE_PATH]
PARAM_NAME_DB_HOST = os.environ[PARAM_NAME_DB_HOST] PARAM_NAME_DB_HOST = os.environ[PARAM_NAME_DB_HOST]
PARAM_NAME_DB_USER_NAME = os.environ[PARAM_NAME_DB_USER_NAME] PARAM_NAME_DB_USER_NAME = os.environ[PARAM_NAME_DB_USER_NAME]
PARAM_NAME_DB_USER_PASSWORD = os.environ[PARAM_NAME_DB_USER_PASSWORD] PARAM_NAME_DB_USER_PASSWORD = os.environ[PARAM_NAME_DB_USER_PASSWORD]
TZ = os.environ[TZ]

8
lambda/check-view-secutiry-option/check-view-option/medaca_logger.py
View File

@ -3,8 +3,8 @@ import logging
import sys import sys
from zoneinfo import ZoneInfo from zoneinfo import ZoneInfo
from constants import DEFAULT_TIMEZONE, LOG_DATE_FORMAT, LOG_FORMAT from constants import LAUNCH_ON_LOCAL, LOG_DATE_FORMAT, LOG_FORMAT
from environments import LOG_LEVEL from environments import LOG_LEVEL, TZ
class SingletonLogger: class SingletonLogger:
@ -17,10 +17,10 @@ class SingletonLogger:
LOG_FORMAT, LOG_FORMAT,
LOG_DATE_FORMAT LOG_DATE_FORMAT
) )
formatter.converter = lambda *arg: datetime.datetime.now(ZoneInfo(DEFAULT_TIMEZONE)).timetuple() formatter.converter = lambda *arg: datetime.datetime.now(ZoneInfo(TZ)).timetuple()
# ローカル環境で動かす場合、標準出力ハンドラーを追加する # ローカル環境で動かす場合、標準出力ハンドラーを追加する
# AWS Lambda上では`LambdaLoggerHandler`がデフォルトでセットされている # AWS Lambda上では`LambdaLoggerHandler`がデフォルトでセットされている
if len(sys.argv) == 2 and sys.argv[1] == 'local': if len(sys.argv) == 2 and sys.argv[1] == LAUNCH_ON_LOCAL:
localHandler = logging.StreamHandler() localHandler = logging.StreamHandler()
logger.addHandler(localHandler) logger.addHandler(localHandler)
for handler in logger.handlers: for handler in logger.handlers: