From 77539db1e98698421d5055faec96f3181d71c2c0 Mon Sep 17 00:00:00 2001 From: Marc Koch Date: Mon, 22 Sep 2025 11:12:29 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=8A=20use=20data=20dir=20as=20default?= =?UTF-8?q?=20base=20dir=20for=20log=20dir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/booking.py | 2 +- src/clear_bookings.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/booking.py b/src/booking.py index a88fc25..9df1bcb 100644 --- a/src/booking.py +++ b/src/booking.py @@ -28,7 +28,7 @@ BASE_DIR = Path(__file__).resolve().parent DATA_DIR = Path(os.getenv("DJANGO_DATA_DIR", "/data")) FILE_LOG_LEVEL = os.getenv("FILE_LOG_LEVEL", "INFO") STDOUT_LOG_LEVEL = os.getenv("STDOUT_LOG_LEVEL", "DEBUG") -LOG_DIR = os.getenv("LOG_DIR", "/data/room-booking.log.jsonl") +LOG_DIR = os.getenv("LOG_DIR", DATA_DIR / "room-booking.log.jsonl") LOGROTATE_BACKUP_COUNT = int(os.getenv("LOGROTATE_BACKUP_COUNT", 6)) LOGROTATE_MAX_BYTES = int(os.getenv("LOGROTATE_MAX_BYTES", 10 * 1024 * 1024)) diff --git a/src/clear_bookings.py b/src/clear_bookings.py index 54c989e..a84fb72 100644 --- a/src/clear_bookings.py +++ b/src/clear_bookings.py @@ -11,6 +11,7 @@ from datetime import datetime, date, timedelta from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.utils import format_datetime +from pathlib import Path import caldav import click @@ -25,9 +26,10 @@ from mylogger.logger import setup_logging tz = pytz.timezone(os.getenv("TIME_ZONE", "Europe/Berlin")) MAX_SEARCH_HORIZON = int(os.getenv("MAX_SEARCH_HORIZON", 14)) +DATA_DIR = Path(os.getenv("DJANGO_DATA_DIR", "/data")) FILE_LOG_LEVEL = os.getenv("FILE_LOG_LEVEL", "INFO") STDOUT_LOG_LEVEL = os.getenv("STDOUT_LOG_LEVEL", "DEBUG") -LOG_DIR = os.getenv("LOG_DIR", "/data/room-booking.log.jsonl") +LOG_DIR = os.getenv("LOG_DIR", DATA_DIR / "room-booking.log.jsonl") LOGROTATE_BACKUP_COUNT = int(os.getenv("LOGROTATE_BACKUP_COUNT", 6)) LOGROTATE_MAX_BYTES = int(os.getenv("LOGROTATE_MAX_BYTES", 10 * 1024 * 1024))