Skip to content

feat: docker plain logging #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbrockmann merged 2 commits into from
Jul 1, 2025
Merged

feat: docker plain logging #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b964152
refactor: simplify import handling for RichHandler in logging configu…
dbrockmann Jul 1, 2025
2c2ee74
feat: set docker logging to plain format
dbrockmann Jul 1, 2025
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
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ FROM python:3.12-slim

ENV PYTHONUNBUFFERED=1 \
JOINLY_SERVER_HOST="0.0.0.0" \
JOINLY_SERVER_PORT=8000
JOINLY_SERVER_PORT=8000 \
JOINLY_LOGGING_PLAIN=1

EXPOSE 8000

Expand Down
1 change: 1 addition & 0 deletions Dockerfile.cuda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ FROM nvidia/cuda:12.6.0-cudnn-runtime-ubuntu24.04
ENV PYTHONUNBUFFERED=1 \
JOINLY_SERVER_HOST="0.0.0.0" \
JOINLY_SERVER_PORT=8000 \
JOINLY_LOGGING_PLAIN=1 \
JOINLY_DEVICE="cuda" \
ONNX_PROVIDER=CUDAExecutionProvider

Expand Down
7 changes: 6 additions & 1 deletion joinly/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,12 @@ def _parse_kv(
@click.option(
"-q", "--quiet", is_flag=True, help="Suppress all but error and critical logging."
)
@click.option("--logging-plain", is_flag=True, help="Use plain logging format.")
@click.option(
"--logging-plain",
is_flag=True,
help="Use plain logging format.",
envvar="JOINLY_LOGGING_PLAIN",
)
@click.argument(
"meeting-url",
default=None,
Expand Down
6 changes: 4 additions & 2 deletions joinly/utils/logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import contextlib
import logging

LOGGING_TRACE = 5
Expand All @@ -20,7 +19,7 @@ def configure_logging(verbose: int, *, quiet: bool, plain: bool) -> None:
logging.addLevelName(LOGGING_TRACE, "TRACE")

if not plain:
with contextlib.suppress(ImportError):
try:
from rich.logging import RichHandler

logging.basicConfig(
Expand All @@ -29,6 +28,9 @@ def configure_logging(verbose: int, *, quiet: bool, plain: bool) -> None:
datefmt="[%X]",
handlers=[RichHandler(rich_tracebacks=True)],
)
except ImportError:
pass
else:
return

logging.basicConfig(
Expand Down