From 62b73656e6f219c11b2b01da85bbc1c9ab9bda61 Mon Sep 17 00:00:00 2001 From: Lucas Media Date: Mon, 26 Oct 2026 18:54:09 +0100 Subject: [PATCH] fix(serverlibrary): fix package structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit structure needs to be: serverlibrary/ ├── pyproject.toml └── serverlibrary/ ├── __init__.py └── core.py --- serverlibrary/pyproject.toml | 2 ++ serverlibrary/{ => serverlibrary}/__init__.py | 0 serverlibrary/{ => serverlibrary}/core.py | 27 ++++++++++--------- 3 files changed, 16 insertions(+), 13 deletions(-) rename serverlibrary/{ => serverlibrary}/__init__.py (100%) rename serverlibrary/{ => serverlibrary}/core.py (95%) diff --git a/serverlibrary/pyproject.toml b/serverlibrary/pyproject.toml index 9d2d106..35ce80d 100755 --- a/serverlibrary/pyproject.toml +++ b/serverlibrary/pyproject.toml @@ -9,3 +9,5 @@ description = "Serverhost Python library" authors = [{ name = "Lucas" }] readme = "README.md" requires-python = ">=3.10" +[tool.setuptools] +py-modules = ["serverlibrary"] diff --git a/serverlibrary/__init__.py b/serverlibrary/serverlibrary/__init__.py similarity index 100% rename from serverlibrary/__init__.py rename to serverlibrary/serverlibrary/__init__.py diff --git a/serverlibrary/core.py b/serverlibrary/serverlibrary/core.py similarity index 95% rename from serverlibrary/core.py rename to serverlibrary/serverlibrary/core.py index 7e426f6..e13aa78 100755 --- a/serverlibrary/core.py +++ b/serverlibrary/serverlibrary/core.py @@ -39,30 +39,31 @@ LOG_LEVELS = { } -def setup_logging(log_level: str = "INFO", logfile: str = "logfile") -> None: +def setup_logging(log_level: str = "INFO", logfile: str | None = None) -> None: formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s") stdout_handler = logging.StreamHandler(sys.stdout) stdout_handler.setFormatter(formatter) stdout_handler.setLevel(LOG_LEVELS[log_level.upper()]) - ext = Path(logfile).suffix - if not ext: - ext = ".log" - logfile_data = ( - Path("/home/lucas/logs/") / f"{logfile}_{datetime.now():%Y%m%d_%H%M%S}{ext}" - ) - - file_handler = logging.FileHandler(logfile_data, encoding="utf-8") - file_handler.setFormatter(formatter) - file_handler.setLevel(TRACE) - root_logger = logging.getLogger() root_logger.setLevel(TRACE) root_logger.handlers.clear() # avoid duplicate logging + logfile_data = "No Logfile" + if logfile: + ext = Path(logfile).suffix + if not ext: + ext = ".log" + logfile_data = ( + Path("/home/lucas/logs/") / f"{logfile}_{datetime.now():%Y%m%d_%H%M%S}{ext}" + ) + file_handler = logging.FileHandler(logfile_data, encoding="utf-8") + file_handler.setFormatter(formatter) + file_handler.setLevel(TRACE) + + root_logger.addHandler(file_handler) root_logger.addHandler(stdout_handler) - root_logger.addHandler(file_handler) root_logger.info(f"Set logger to {log_level}, Logfile: {logfile_data}")