配置相关处理

.gitignore

@@ -8,7 +8,7 @@
 *.pyc
 __pycache__/
 local_settings.py
-pims/settings_local.py
+card/settings/settings_local.py
 db.sqlite3
 db.sqlite3-journal
 media

Dockerfile

 FROM ccr.ccs.tencentyun.com/gm-base/py3.8-buster:v1.0.1
-RUN cat /etc/apt/sources.list
-RUN sed -i s@/deb.debian.org/@/mirrors.aliyun.com/@g /etc/apt/sources.list
-RUN cat /etc/apt/sources.list
-RUN apt-get clean
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends   \
+
+RUN apt-get update && apt-get install -y --no-install-recommends   \
     # 业务相关依赖和安装工具
     libjemalloc-dev \
-    git \
-    g++ \
-    gcc \
-    binutils \
-    clang \
-    cmake \
-    coreutils \
-    dpkg-dev \
-    dpkg \
-    findutils \
-    libc-dev \
-    libffi-dev \
-    libtirpc-dev \
-    make \
-    ncurses-dev \
-    pax-utils \
-    tcl-dev \
-    tk \
-    tk-dev \
-    python3-dev \
-    librdkafka-dev \
-    libxml2-dev \
-    libxslt-dev \
-    librdkafka-dev \
-    libaio-dev \
-    libffi-dev \
-    gfortran \
-    swig \
-    liblapack-dev \
-    musl-dev \
-    && ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
+    git
 
-# ENV LD_PRELOAD $LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
+ENV LD_PRELOAD $LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
 
 WORKDIR /srv/apps/card/
-ENV POETRY_VIRTUALENVS_IN_PROJECT=true \
-       POETRY_NO_INTERACTION=1 \
-       PYSETUP_PATH="/srv/apps/card" \
-       VENV_PATH="/srv/apps/card/.venv"
 
-# prepend poetry and venv to path
-ENV PATH="$VENV_PATH/bin:$PATH"
+COPY ./pyproject.toml /srv/apps/card/pyproject.toml
 
-# 提前安装 依赖, 使用 docker cache
-COPY ./pyproject.toml ./poetry.lock /srv/apps/card/
 RUN poetry install -v
 
 COPY . .
 
-RUN poetry run pip install -i https://pypi-1593408770345:241c0cbfa8437730ad982ece687b5a06e78dcf83@gengmei-pypi.pkg.coding.net/tob/pypi/simple gm-types -U
-RUN poetry run pip install -i https://pypi-1593408770345:241c0cbfa8437730ad982ece687b5a06e78dcf83@gengmei-pypi.pkg.coding.net/tob/pypi/simple redis
+RUN poetry update gm-types && poetry install
 
-RUN mkdir -p /data/log/card/app/
-ENV GM_RPCD_MODE "deploy"
-ENV RPCD_SETTINGS_MODULE "card.settings"
+RUN mkdir -p /data/log/card/app
 
-CMD poetry run gunicorn fastapi_rpcd.asgi:application -w 1 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:8000 --worker-tmp-dir /dev/shm
+ENV GM_RPCD_MODE "deploy"
+ENV RPCD_SETTINGS_MODULE "card.settings.settings"
+CMD poetry run gunicorn fastapi_rpcd.asgi:application -w 1 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:8000

Dockerfile_bak

@@ -67,6 +67,6 @@ RUN poetry update gm-types
 
 RUN mkdir -p /data/log/card/app/
 ENV GM_RPCD_MODE "deploy"
-ENV RPCD_SETTINGS_MODULE "card.settings"
+ENV RPCD_SETTINGS_MODULE "card.settings.settings"
 
 CMD poetry run gunicorn fastapi_rpcd.asgi:application -w 1 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:8000 --worker-tmp-dir /dev/shm

card/libs/protocol.py

 from gm_protocol import GmProtocol
 
-from card import settings
+from card.settings import settings
 
 gm_protocol = GmProtocol(settings.API_HOST, settings.WEB_API_HOST)

card/rpcd/fastapi_ext/app.py

@@ -2,7 +2,7 @@
 import asyncio
 import sentry_sdk
 
-from card import settings
+from card.settings import settings
 from card.utils import redis
 
 

card/log_settings.py → card/settings/log_settings.py

@@ -4,7 +4,7 @@ from typing import Dict
 
 from pydantic import BaseModel
 
-LOG_DIR = "/data/log/card/app/"
+LOG_DIR = "./data/log/card/app/"
 
 
 class LoggingSettings(BaseModel):

card/settings.py → card/settings/settings.py

@@ -41,7 +41,8 @@ TRACTATE_TAG_DISPLAY_NUM_CONTROL = 5
 EXPERT_MEMBERSHIP_IMG = 'https://heras.igengmei.com/2019/06/27/1469deaf2b'
 
 try:
-    from card.log_settings import LOG_DIR, LOGGING
-    from card.settings_local import *
+    from card.settings.log_settings import LOG_DIR, LOGGING
+    from card.settings.settings_local import *
 except ModuleNotFoundError:
     pass
+

card/settings_local.py.template

 from typing import Any, Dict
 
 #redis配置
-REDIS_DSN = "redis://redis.paas-test.env:6379/0"
+REDIS_DSN = "redis://redis-service:6379/0"
 REDIS_URL=REDIS_DSN
 REDIS_URL2=REDIS_DSN
 REDIS_URL3=REDIS_DSN
@@ -22,7 +22,7 @@ TIME_ZONE = 'Asia/Shanghai'
 
 
 try:
-    from card.log_settings import LOG_DIR, LOGGING
-    from card.settings_local import *
+    from card.settings.log_settings import LOG_DIR, LOGGING
+    from card.settings.settings_local import *
 except ModuleNotFoundError:
     pass

card/utils/jump.py

 from gm_protocol import GmProtocol  # type: ignore
 
-from card import settings
+from card.settings import settings
 
 gm_protocol = GmProtocol(api_host=settings.API_HOST, msite_host=settings.WEB_API_HOST)

card/utils/log_utils.py

@@ -21,7 +21,7 @@ def logging_exception():
 
 def configure_logging():
     """ 日志组件初始化. """
-    from card.log_settings import LOGGING
+    from card.settings.log_settings import LOGGING
 
     logging.config.dictConfig(LOGGING)
 

card/utils/redis/__init__.py

 # -*- coding: utf-8 -*-
 from typing import Optional
 import aioredis  # type: ignore
-from card import settings
+from card.settings import settings
 from aioredis import ConnectionsPool  # type: ignore
 
 

card/utils/redis/cache.py

 import redis
-from card import settings
+from card.settings import settings
 
 
 pool = redis.ConnectionPool.from_url(settings.REDIS_URL3, port=6379, max_connections=30)

card/views/__init__.py

@@ -2,7 +2,7 @@ from pkgutil import iter_modules, walk_packages
 from inspect import getmembers
 
 from card import views
-from card.settings import IGNORE_VIEW_PATHS
+from card.settings.settings import IGNORE_VIEW_PATHS
 from card.utils.log_utils import info_logger
 
 

card/views/live/format.py

@@ -3,7 +3,7 @@ from typing import List
 from gm_types.gaia import USER_TYPE, LIVE_STATUS
 from gm_types.merchant.live import LIVE_PLAYER_ENTRANCE
 
-from card import settings
+from card.settings import settings
 from card.libs.protocol import gm_protocol
 from card.views.utils.format import BaseFormat
 from .schemas import LiveInfo, LiveList

card/views/special_pool/format.py

 from typing import List
 
-from card import settings
+from card.settings import settings
 from card.libs.protocol import gm_protocol
 from card.views.utils.format import BaseFormat
 from .schemas import SpecialPoolInfo, SpecialPoolList, VisualPageInfo, VisualPageList

card/views/tractate/format.py

@@ -5,7 +5,7 @@ from gm_types.gaia import TAG_VERSION
 from gm_types.mimas import TRACTATE_COVER_TYPE
 from gm_upload.utils.image_utils import Picture
 
-from card import settings
+from card.settings import settings
 from card.views.schemas import Tag
 from card.views.utils.html import gm_decode_html
 from card.views.utils.tag import feed_tag_v3_show_filter

card/views/utils/format.py

@@ -3,7 +3,7 @@ from gm_types.gaia import USER_TYPE
 
 from card.views.schemas import User, Video
 from card.libs.protocol import gm_protocol
-from card import settings
+from card.settings import settings
 
 
 class BaseFormat(object):

card/views/utils/tag.py

@@ -2,7 +2,7 @@ from collections import defaultdict
 
 from gm_types.gaia import TAG_TYPE, TAG_VERSION
 
-from card import settings
+from card.settings import settings
 from card.libs.protocol import gm_protocol
 
 def feed_tag_v3_show_filter(tags):

ci.Jenkinsfile

@@ -20,7 +20,7 @@ pipeline {
           echo "install..."
           sh 'git reset $MR_TARGET_SHA --soft && git restore --staged -- .'
           sh 'poetry install'
-          sh 'cp card/settings_local.py.template card/settings_local.py'
+          sh 'cp card/settings/settings_local.py.template card/settings/settings_local.py'
           sh 'cp rpcd.env.template rpcd.env'
         }
     }

scripts/format

@@ -7,7 +7,7 @@ declare -a filteredFiles
 
 if [ $# -eq 0 ]; then
     files=`git diff --diff-filter=d --name-only | grep -E '^app.*$'`
-    
+
     if [ -z "${files}" ]; then
         echo "no files changed to format..."
         exit 0