diff --git a/logging.yaml b/src/captura/logging.yaml similarity index 100% rename from logging.yaml rename to src/captura/logging.yaml diff --git a/src/captura/util.py b/src/captura/util.py index 246dc08..8eca273 100644 --- a/src/captura/util.py +++ b/src/captura/util.py @@ -127,7 +127,7 @@ def from_env(v: str, default: str | None = None, *, prefix: bool = True): PATH_STATIC = from_env("STATIC", Path.app("static")) PATH_LOGS = from_env("LOGS", Path.base("logs")) -PATH_CONFIG_LOG = from_env("LOGS_CONFIG", Path.base("logging.yaml")) +PATH_CONFIG_LOG = from_env("LOGS_CONFIG", Path.app("logging.yaml")) PLUGINS_USE = from_env("PLUGINS_USE", "1") == "1" VERBOSE = from_env("VERBOSE", "0") != "0" diff --git a/src/simulatus/__init__.py b/src/simulatus/__init__.py index b4efb02..391d05d 100644 --- a/src/simulatus/__init__.py +++ b/src/simulatus/__init__.py @@ -78,7 +78,6 @@ from simulatus.mk import Mk, combos from simulatus.reports import ReportController -util.setup_logging(util.Path.base("logging.test.yaml")) logger = util.get_logger(__name__) # =========================================================================== # diff --git a/tests/conftest.py b/tests/conftest.py index aaa2910..82cc876 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -215,7 +215,7 @@ def resolve_config_captura(pytestconfig: pytest.Config) -> PytestConfig: logger.debug("Loading application configuration.") app = AppConfig.model_validate( { - "logging_configuration_path": util.Path.base("logging.test.yaml"), + "logging_configuration_path": util.Path.base("tests/logging.yaml"), } ) diff --git a/logging.test.yaml b/tests/logging.yaml similarity index 100% rename from logging.test.yaml rename to tests/logging.yaml