Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ RUN apt-get update && \
patchelf \
&& rm -rf /var/lib/apt/lists/*

RUN uv pip install scons && \
RUN uv pip install --no-cache-dir scons~=4.9 && \
uv sync --group compile && \
uv pip list

Expand Down
3 changes: 1 addition & 2 deletions src/example_app/gunicorn.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
import uvicorn.workers
from gunicorn import config, glogging

from .logger import InterceptHandler, get_logger
from .logger import InterceptHandler
from .settings import settings


class GunicornLogger(glogging.Logger):
def __init__(self: GunicornLogger, cfg: config.Config) -> None:
super().__init__(cfg)

get_logger()
for name in ["gunicorn.error", "gunicorn.access"]:
logging.getLogger(name).handlers = [InterceptHandler(depth=1)]

Expand Down
13 changes: 0 additions & 13 deletions src/example_app/logger.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
from __future__ import annotations

import atexit
import inspect
import logging
import sys

import loguru
from loguru import logger
Expand Down Expand Up @@ -36,17 +34,6 @@ def emit(self: InterceptHandler, record: logging.LogRecord) -> None:


def get_logger() -> loguru.Logger:
from .settings import settings

logger.remove()
logger.add(
sys.stderr, level=settings.loguru_level.upper(), enqueue=settings.loguru_enqueue
)
atexit.register(logger.complete)

logging.basicConfig(
level=settings.loguru_level.upper(), handlers=[InterceptHandler()]
)
for name in ["uvicorn.access", "uvicorn.error"]:
if name in logging.root.manager.loggerDict:
_logger = logging.getLogger(name)
Expand Down
1 change: 0 additions & 1 deletion src/example_app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ async def ok() -> Ok:
host=settings.host,
port=settings.port,
reload=True,
log_config=None,
)
5 changes: 2 additions & 3 deletions src/example_app/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ class Settings(BaseSettings):
port: int = 8000
web_concurrency: int = 2 * multiprocessing.cpu_count() + 1

# logging
loguru_level: str = "info"
loguru_enqueue: bool = True
# loguru
loguru_level: str = "INFO"

model_config = SettingsConfigDict(env_file=".env")

Expand Down
Loading