From 369ab477368f5692f4ee3bcf59506070c719ec51 Mon Sep 17 00:00:00 2001 From: Georges-Antoine Assi Date: Mon, 25 Mar 2024 17:30:38 -0400 Subject: [PATCH] get rid of logs volume --- backend/logger/file_formatter.py | 23 ----------------------- backend/logger/logger.py | 17 ----------------- docker/Dockerfile | 2 +- examples/docker-compose.example.yml | 1 - unraid_template/romm.xml | 1 - 5 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 backend/logger/file_formatter.py diff --git a/backend/logger/file_formatter.py b/backend/logger/file_formatter.py deleted file mode 100644 index b550e3b1d..000000000 --- a/backend/logger/file_formatter.py +++ /dev/null @@ -1,23 +0,0 @@ -import logging - - -class FileFormatter(logging.Formatter): - level: str = "%(levelname)s" - dots: str = ":" - identifier: str = "\t [RomM]" - identifier_warning: str = " [RomM]" - identifier_critical: str = " [RomM]" - msg: str = "%(message)s" - date: str = "[%(asctime)s] " - FORMATS: dict = { - logging.DEBUG: level + dots + identifier + date + msg, - logging.INFO: level + dots + identifier + date + msg, - logging.WARNING: level + dots + identifier_warning + date + msg, - logging.ERROR: level + dots + identifier + date + msg, - logging.CRITICAL: level + dots + identifier_critical + date + msg - } - - def format(self, record): - log_fmt = self.FORMATS.get(record.levelno) - formatter = logging.Formatter(fmt=log_fmt, datefmt='%Y-%m-%d %H:%M:%S') - return formatter.format(record) \ No newline at end of file diff --git a/backend/logger/logger.py b/backend/logger/logger.py index 69affbee3..a2d6fcb64 100644 --- a/backend/logger/logger.py +++ b/backend/logger/logger.py @@ -1,20 +1,8 @@ import logging import sys -from datetime import datetime -from pathlib import Path -from typing import Final -from config import ROMM_BASE_PATH -from logger.file_formatter import FileFormatter from logger.stdout_formatter import StdoutFormatter -LOGS_BASE_PATH: Final = f"{ROMM_BASE_PATH}/logs" - -# Create logs folder if not exists -Path(LOGS_BASE_PATH).mkdir(parents=True, exist_ok=True) -now = datetime.now() -logs_file = f"{LOGS_BASE_PATH}/{now.strftime('%Y%m%d_%H%M%S')}.log" - # Get logger log = logging.getLogger("romm") log.setLevel(logging.DEBUG) @@ -24,10 +12,5 @@ stdout_handler = logging.StreamHandler(sys.stdout) stdout_handler.setFormatter(StdoutFormatter()) log.addHandler(stdout_handler) -# Define file handler -file_handler = logging.FileHandler(logs_file) -file_handler.setFormatter(FileFormatter()) -log.addHandler(file_handler) - # Hush passlib warnings logging.getLogger("passlib").setLevel(logging.ERROR) diff --git a/docker/Dockerfile b/docker/Dockerfile index c907541ab..a8e1b1942 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -163,7 +163,7 @@ FROM scratch COPY --from=production-stage / / # Declare the supported volumes -VOLUME ["/romm/resources", "/romm/library", "/romm/assets", "/romm/logs", "/romm/config", "/redis-data"] +VOLUME ["/romm/resources", "/romm/library", "/romm/assets", "/romm/config", "/redis-data"] # Expose ports and start EXPOSE 8080 diff --git a/examples/docker-compose.example.yml b/examples/docker-compose.example.yml index f51e4cc0a..49e49b499 100644 --- a/examples/docker-compose.example.yml +++ b/examples/docker-compose.example.yml @@ -26,7 +26,6 @@ services: - /path/to/library:/romm/library # Your game library - /path/to/assets:/romm/assets # Uploaded saves, states, etc. - /path/to/config:/romm/config # [Optional] Path where config.yml is stored - - /path/to/logs:/romm/logs # [Optional] Path where logs are stored ports: - 80:8080 depends_on: diff --git a/unraid_template/romm.xml b/unraid_template/romm.xml index a5d4d15c8..9ad97df4b 100644 --- a/unraid_template/romm.xml +++ b/unraid_template/romm.xml @@ -30,7 +30,6 @@ /mnt/user/appdata/romm/resources /mnt/user/appdata/romm/assets - /mnt/user/appdata/romm/logs