From 9644be45866eace74bdd69d9d1fc6c64cb638166 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 31 Aug 2023 13:14:43 +0900 Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20=E6=9C=AA=E4=BD=BF=E7=94=A8impo?= =?UTF-8?q?rt=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/model/internal/jwt_token.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ecs/jskult-webapp/src/model/internal/jwt_token.py b/ecs/jskult-webapp/src/model/internal/jwt_token.py index 30a7540f..1f5a6cf7 100644 --- a/ecs/jskult-webapp/src/model/internal/jwt_token.py +++ b/ecs/jskult-webapp/src/model/internal/jwt_token.py @@ -1,5 +1,4 @@ import base64 -import datetime import json from typing import Optional From ab81dd14d779effd4b952f5b2e2359e265dd38f3 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 31 Aug 2023 13:15:34 +0900 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20SessionLocal=E3=81=AE=E5=8B=95?= =?UTF-8?q?=E4=BD=9C=E7=A2=BA=E8=AA=8D=E7=94=A8Endpoint=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/main.py | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/ecs/jskult-webapp/src/main.py b/ecs/jskult-webapp/src/main.py index 495c4cc7..3bd9e73c 100644 --- a/ecs/jskult-webapp/src/main.py +++ b/ecs/jskult-webapp/src/main.py @@ -1,6 +1,6 @@ import os.path as path -from fastapi import Depends, FastAPI +from fastapi import FastAPI from fastapi.staticfiles import StaticFiles from starlette import status @@ -8,11 +8,8 @@ import src.static as static from src.controller import (bio, bio_download, healthcheck, login, logout, master_mainte, menu, root, ultmarc) from src.core import task -from src.depends.services import get_service from src.error.exception_handler import http_exception_handler from src.error.exceptions import UnexpectedException -from src.logging.get_logger import get_logger -from src.services.batch_status_service import BatchStatusService app = FastAPI() @@ -47,18 +44,3 @@ app.add_exception_handler(UnexpectedException, http_exception_handler) # サーバー起動時のイベント app.add_event_handler('startup', task.create_start_app_handler) - - -# logger = get_logger(__name__) - - -# @app.get('/sample/') -# def sample(service: BatchStatusService = Depends(get_service(BatchStatusService))): -# # import os -# # import threading -# logger.info('START') -# res = service.hdke_table_record -# logger.info(res) -# logger.info('END') -# return res -# # return f'{os.getpid()}, {threading.get_ident()}' From 9bbdc2e1b859edc74b21c0de4ccb7a96dbe0b3b1 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 31 Aug 2023 13:20:39 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20pid,=20tid=E3=81=AF=E5=87=BA?= =?UTF-8?q?=E3=81=95=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/logging/get_logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-webapp/src/logging/get_logger.py b/ecs/jskult-webapp/src/logging/get_logger.py index 8c15d6e7..f36f1199 100644 --- a/ecs/jskult-webapp/src/logging/get_logger.py +++ b/ecs/jskult-webapp/src/logging/get_logger.py @@ -27,7 +27,7 @@ def get_logger(log_name: str) -> logging.Logger: logger.addHandler(handler) formatter = logging.Formatter( - '%(name)s[%(process)d][%(thread)d]\t[%(levelname)s]\t%(asctime)s\t%(message)s', + '%(name)s\t[%(levelname)s]\t%(asctime)s\t%(message)s', '%Y-%m-%d %H:%M:%S' ) From 5711c333b25a0e2e9a5568e0744c5e11e869edc6 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 31 Aug 2023 13:27:31 +0900 Subject: [PATCH 4/5] =?UTF-8?q?style:=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88=E3=81=A7=E6=AE=8B=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=8A=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/router/session_router.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ecs/jskult-webapp/src/router/session_router.py b/ecs/jskult-webapp/src/router/session_router.py index e8cb23f9..9389a722 100644 --- a/ecs/jskult-webapp/src/router/session_router.py +++ b/ecs/jskult-webapp/src/router/session_router.py @@ -5,7 +5,6 @@ from fastapi.exceptions import HTTPException from fastapi.routing import APIRoute from starlette import status -# from src.db.database import Database from src.depends.auth import (check_session_expired, get_current_session, verify_session) from src.error.exceptions import DBException, UnexpectedException @@ -78,18 +77,6 @@ class MeDaCaRoute(APIRoute): return response -# class PrepareDatabaseRoute(MeDaCaRoute): -# """事前処理として、データベースのエンジンを作成するルートハンドラー -# Args: -# MeDaCaRoute (MeDaCaRoute): 共通ルートハンドラー -# """ -# async def pre_process_route(self, request: Request): -# request = await super().pre_process_route(request) -# # DBエンジンを構築して状態にセット -# request.app.state._db = Database.get_instance() -# return request - - class BeforeCheckSessionRoute(MeDaCaRoute): """事前処理として、セッションチェックを行うルートハンドラー @@ -112,7 +99,7 @@ class BeforeCheckSessionRoute(MeDaCaRoute): return session_request -class AfterSetCookieSessionRoute(MeDaCaRoute): # (PrepareDatabaseRoute): +class AfterSetCookieSessionRoute(MeDaCaRoute): """事後処理として、セッションキーをcookieに設定するカスタムルートハンドラー""" async def post_process_route(self, request: Request, response: Response): response = await super().post_process_route(request, response) From 175048d7cccca1362762666dce6a97327fdf0f82 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 31 Aug 2023 13:39:08 +0900 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20Worker=E8=B5=B7=E5=8B=95=E6=95=B0?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B41=E2=86=922?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-webapp/Dockerfile b/ecs/jskult-webapp/Dockerfile index aea8870f..b865a24d 100644 --- a/ecs/jskult-webapp/Dockerfile +++ b/ecs/jskult-webapp/Dockerfile @@ -16,4 +16,4 @@ RUN \ COPY src ./src -CMD ["gunicorn", "src.main:app", "-w", "1", "-k" ,"uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:80", "--timeout", "300"] +CMD ["gunicorn", "src.main:app", "-w", "2", "-k" ,"uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:80", "--timeout", "300"]