mirror of
https://github.com/calibrain/shelfmark.git
synced 2026-10-04 12:31:13 +01:00
CaliBrain
57f15b4d95
Refactor: Improve Docker build, add Tor support, use SeleniumBase
- Overhauled Dockerfile:
- Switched to python:3.10-slim base.
- Implemented multi-stage builds (base, standard, tor).
- Consolidated RUN layers for efficiency.
- Added locale/timezone setup.
- Added Tor setup and iptables configuration in dedicated stage/script.
- Replaced DrissionPage with SeleniumBase for Cloudflare bypassing.
- Added Tor support via `docker-compose.tor.yml` and `tor.sh` script.
- Updated `docker-compose.yml` to build locally and changed default port
to 8083.
- Added `docker-compose.dev.yml` and `docker-compose.tor.dev.yml`.
- Updated `entrypoint.sh` for timezone and sudo usage.
- Added/Updated environment variables (`TZ`, `USING_TOR`, etc.).
- Improved `.dockerignore`.
- Updated `readme.md` to reflect port changes, build process, document
`TZ`, and add details about the new Tor variant.
78 lines
2.7 KiB
Python
78 lines
2.7 KiB
Python
"""Centralized logging configuration for the book downloader application."""
|
|
|
|
import logging
|
|
import sys
|
|
from pathlib import Path
|
|
from logging.handlers import RotatingFileHandler
|
|
from env import LOG_FILE, ENABLE_LOGGING, LOG_LEVEL
|
|
from typing import Any
|
|
|
|
class CustomLogger(logging.Logger):
|
|
"""Custom logger class with additional error_trace method."""
|
|
|
|
def error_trace(self, msg: Any, *args: Any, **kwargs: Any) -> None:
|
|
"""Log an error message with full stack trace."""
|
|
self.error(msg, *args, exc_info=True, **kwargs)
|
|
|
|
def setup_logger(name: str, log_file: Path = LOG_FILE) -> CustomLogger:
|
|
"""Set up and configure a logger instance.
|
|
|
|
Args:
|
|
name: The name of the logger instance
|
|
log_file: Optional path to log file. If None, logs only to stdout/stderr
|
|
|
|
Returns:
|
|
CustomLogger: Configured logger instance with error_trace method
|
|
"""
|
|
# Register our custom logger class
|
|
logging.setLoggerClass(CustomLogger)
|
|
|
|
# Create logger as CustomLogger instance
|
|
logger = CustomLogger(name)
|
|
log_level = logging.INFO
|
|
if LOG_LEVEL == "DEBUG":
|
|
log_level = logging.DEBUG
|
|
elif LOG_LEVEL == "INFO":
|
|
log_level = logging.INFO
|
|
elif LOG_LEVEL == "WARNING":
|
|
log_level = logging.WARNING
|
|
elif LOG_LEVEL == "ERROR":
|
|
log_level = logging.ERROR
|
|
elif LOG_LEVEL == "CRITICAL":
|
|
log_level = logging.CRITICAL
|
|
logger.setLevel(log_level)
|
|
|
|
formatter = logging.Formatter(
|
|
'%(asctime)s - %(name)s - %(levelname)s - %(filename)s:%(lineno)d - %(message)s'
|
|
)
|
|
|
|
# Console handler for Docker output
|
|
console_handler = logging.StreamHandler(sys.stdout)
|
|
console_handler.setFormatter(formatter)
|
|
console_handler.setLevel(log_level)
|
|
console_handler.addFilter(lambda record: record.levelno < logging.ERROR) # Only allow logs below ERROR to stdout
|
|
logger.addHandler(console_handler)
|
|
|
|
# Error handler for stderr
|
|
error_handler = logging.StreamHandler(sys.stderr)
|
|
error_handler.setLevel(logging.ERROR) # Error and above go to stderr
|
|
error_handler.setFormatter(formatter)
|
|
logger.addHandler(error_handler)
|
|
|
|
# File handler if log file is specified
|
|
try:
|
|
if ENABLE_LOGGING:
|
|
# Create log directory if it doesn't exist
|
|
log_dir = log_file.parent
|
|
log_dir.mkdir(parents=True, exist_ok=True)
|
|
file_handler = RotatingFileHandler(
|
|
log_file,
|
|
maxBytes=10485760, # 10MB
|
|
backupCount=5
|
|
)
|
|
file_handler.setFormatter(formatter)
|
|
logger.addHandler(file_handler)
|
|
except Exception as e:
|
|
logger.error_trace(f"Failed to create log file: {e}", exc_info=True)
|
|
|
|
return logger |