diff --git a/.github/workflows/deploy-fastapi.yml b/.github/workflows/deploy-fastapi.yml index 1fc2c615..a88c4fa3 100644 --- a/.github/workflows/deploy-fastapi.yml +++ b/.github/workflows/deploy-fastapi.yml @@ -29,6 +29,7 @@ jobs: echo "LOKI_PASSWORD=${{ secrets.LOKI_PASSWORD }}" >> .env.prod echo "ENV_NAME=${{ secrets.ENV_NAME }}" >> .env.prod echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> .env.prod + echo "MODE=prd" >> .env.prod - name: Set repo lowercase run: echo "REPO_LC=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV diff --git a/apps/pre-processing-service/Dockerfile b/apps/pre-processing-service/Dockerfile index 69b7cacd..383ea749 100644 --- a/apps/pre-processing-service/Dockerfile +++ b/apps/pre-processing-service/Dockerfile @@ -32,4 +32,4 @@ COPY . . # (권장 대안) 코드에서 uvicorn import 안 하고 프로세스 매니저로 실행하려면: -CMD ["gunicorn", "-k", "uvicorn.workers.UvicornWorker", "app.main:app", "-b", "0.0.0.0:8000"] +ENTRYPOINT ["gunicorn", "-k", "uvicorn.workers.UvicornWorker", "app.main:app", "-b", "0.0.0.0:8000"] diff --git a/apps/pre-processing-service/app/core/config.py b/apps/pre-processing-service/app/core/config.py index 2de3833a..c6f31f49 100644 --- a/apps/pre-processing-service/app/core/config.py +++ b/apps/pre-processing-service/app/core/config.py @@ -82,7 +82,9 @@ class BaseSettingsConfig(BaseSettings): mecab_path: Optional[str] = None # Loki 설정 - loki_host: str = "localhost" + loki_host: str + loki_username: str + loki_password: str loki_port: int = 3100 # 테스트/추가용 필드 @@ -106,7 +108,7 @@ def db_url(self) -> str: f"@{self.db_host}:{self.db_port}/{self.db_name}" ) - model_config = SettingsConfigDict(env_file=[".env"]) + model_config = SettingsConfigDict(env_file=[".env"], extra="ignore") # 환경별 설정 클래스 diff --git a/docker/production-fastapi/promtail-config.yml b/docker/production-fastapi/promtail-config.yml index b44fee00..170919e5 100644 --- a/docker/production-fastapi/promtail-config.yml +++ b/docker/production-fastapi/promtail-config.yml @@ -20,7 +20,7 @@ scrape_configs: __path__: /logs/production/app.log pipeline_stages: - regex: - expression: + expression: '^\[(?P[^\]]*)\] (?P\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}) \| (?P\w+) \| (?P[^:]+:[^:]+:\d+) \| (?P.*)$' - labels: traceId: level: @@ -39,7 +39,7 @@ scrape_configs: __path__: /logs/production/error.log pipeline_stages: - regex: - expression: + expression: '^\[(?P[^\]]*)\] (?P\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}) \| (?P\w+) \| (?P[^:]+:[^:]+:\d+) \| (?P.*)$' - labels: traceId: level: