feat: printでログ出力していたのを修正

This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-06-07 09:27:06 +09:00
parent c874596c86
commit cdd35e884e
7 changed files with 25 additions and 16 deletions

View File

@ -57,7 +57,7 @@ async def download_bio_data(
if search_result_df.size < 1:
# 検索結果が0件の場合、download_urlを返さない
print('Bio data not found')
logger.info('検索結果が0件です')
return {'status': 'ok', 'download_url': None}
# ファイルに打ち出すカラムを抽出
@ -73,7 +73,7 @@ async def download_bio_data(
download_file_url = bio_service.generate_download_file_url(
local_file_path, download_param.user_id, download_param.ext)
except Exception as e:
print('S3 access error', e.args)
logger.exception(f'S3 アクセスエラー{e}')
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
detail={'error': 'aws_error', 'message': e.args}
@ -107,9 +107,7 @@ def _search_bio_data(bio_service: BioViewService, search_param: BioModel, user_i
try:
# 生物由来データを検索
search_result_df, query = bio_service.search_download_bio_data(search_param)
# TODO: ファイルにも出力する
except DBException as e:
logger.exception(f'DB Error: {e}')
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
detail={'error': 'db_error', 'message': e.args}

View File

@ -5,11 +5,13 @@ from fastapi import Depends
from fastapi.security import APIKeyCookie, APIKeyQuery
from src.error.exceptions import JWTTokenVerifyException
from src.logging.get_logger import get_logger
from src.model.internal.jwt_token import JWTToken
from src.model.internal.session import UserSession
from src.services.session_service import get_session
from src.system_var import environment
logger = get_logger('認証チェック')
cookie_security = APIKeyCookie(name='session', auto_error=False)
code_security = APIKeyQuery(name='code', auto_error=False)
@ -45,6 +47,6 @@ def verify_session(session: Union[UserSession, None] = Depends(check_session_exp
try:
jwt_token.verify_token()
except JWTTokenVerifyException as e:
print(e)
logger.info(e)
return None
return session

View File

@ -1,6 +1,9 @@
from src.logging.get_logger import get_logger
from src.model.db.hdke_tbl import HdkeTblModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('日付テーブル取得')
class HdkeTblRepository(BaseRepository):
FETCH_SQL = "SELECT bch_actf FROM src05.hdke_tbl"
@ -13,8 +16,7 @@ class HdkeTblRepository(BaseRepository):
models = [HdkeTblModel(**r) for r in result]
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e}")
raise e
finally:
self._database.disconnect()

View File

@ -1,6 +1,9 @@
from src.logging.get_logger import get_logger
from src.model.db.pharmacy_product_master import PharmacyProductMasterModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('製品取得')
class PharmacyProductMasterRepository(BaseRepository):
@ -31,9 +34,7 @@ class PharmacyProductMasterRepository(BaseRepository):
models = [PharmacyProductMasterModel(**r) for r in result]
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] getOroshiData DB Error. ")
print(f"[ERROR] ErrorMessage: {e.args}")
logger.exception(f"DB Error : Exception={e}")
raise e
finally:
self._database.disconnect()

View File

@ -1,6 +1,9 @@
from src.logging.get_logger import get_logger
from src.model.db.user_master import UserMasterModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('ユーザー取得')
class UserMasterRepository(BaseRepository):
FETCH_SQL = """\
@ -22,8 +25,7 @@ class UserMasterRepository(BaseRepository):
return None
return models[0]
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e}")
raise e
finally:
self._database.disconnect()

View File

@ -1,6 +1,9 @@
from src.logging.get_logger import get_logger
from src.model.db.wholesaler_master import WholesalerMasterModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('卸データ取得')
class WholesalerMasterRepository(BaseRepository):
@ -34,9 +37,7 @@ class WholesalerMasterRepository(BaseRepository):
models = [WholesalerMasterModel(**r) for r in result_data]
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] getOroshiData DB Error. ")
print(f"[ERROR] ErrorMessage: {e.args}")
logger.exception(f"DB Error : Exception={e}")
raise e
finally:
self._database.disconnect()

View File

@ -1,6 +1,9 @@
from src.logging.get_logger import get_logger
from src.model.internal.session import UserSession
logger = get_logger('セッション管理')
def set_session(session: UserSession) -> str:
session.save()
@ -12,5 +15,5 @@ def get_session(key: str) -> UserSession:
session = UserSession.get(hash_key=key, consistent_read=True)
return session
except UserSession.DoesNotExist as e:
print(e)
logger.debug(f'セッション取得失敗:{e}')
return None