Cleaned up logging code

This commit is contained in:
Donkie
2023-06-25 16:28:23 +02:00
parent 2caee6120e
commit 7c8d13e8a3

View File

@@ -3,6 +3,7 @@
import logging import logging
import os import os
import subprocess import subprocess
from logging.handlers import TimedRotatingFileHandler
from pathlib import Path from pathlib import Path
import uvicorn import uvicorn
@@ -15,31 +16,24 @@ from spoolman import env
from spoolman.api.v1.router import app as v1_app from spoolman.api.v1.router import app as v1_app
from spoolman.database.database import get_connection_url, setup_db from spoolman.database.database import get_connection_url, setup_db
# Get the data directory # Define a file logger with log rotation
data_dir = Path(user_data_dir("spoolman")) data_dir = Path(user_data_dir("spoolman"))
data_dir.mkdir(parents=True, exist_ok=True) data_dir.mkdir(parents=True, exist_ok=True)
log_file = data_dir.joinpath("spoolman.log")
file_handler = TimedRotatingFileHandler(log_file, when="midnight", backupCount=5)
file_handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(message)s", "%Y-%m-%d %H:%M:%S"))
# Setup file logger # Define a console logger
logging.basicConfig( console_handler = logging.StreamHandler()
filename=data_dir.joinpath("spoolman.log"), console_handler.setFormatter(logging.Formatter("%(name)-26s %(levelname)-8s %(message)s"))
filemode="w",
format="%(asctime)s:%(levelname)s:%(message)s",
datefmt="%Y-%m-%d %I:%M:%S%p",
)
# Setup the base logger # Setup the spoolman logger, which all spoolman modules will use
spoolman_logger = logging.getLogger("spoolman") root_logger = logging.getLogger()
spoolman_logger.setLevel(env.get_logging_level()) root_logger.setLevel(env.get_logging_level())
root_logger.addHandler(file_handler)
root_logger.addHandler(console_handler)
# Log all messages to console # Get logger instance for this module
formatter = logging.Formatter("%(name)-12s: %(levelname)-8s %(message)s")
console = logging.StreamHandler()
console.setLevel(env.get_logging_level())
console.setFormatter(formatter)
root_logger = logging.getLogger("")
root_logger.addHandler(console)
# Get logger instance
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)