From 541f65cca1c05320c22279feff138fcd6f0297e6 Mon Sep 17 00:00:00 2001 From: Hugo Buddelmeijer Date: Fri, 19 Jan 2024 11:42:18 +0100 Subject: [PATCH 1/3] Set loglevel to INFO by default DEBUG should only be used when, well, debugging, and is thus not useful to have on by default. --- scopesim/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scopesim/__init__.py b/scopesim/__init__.py index 2a7b71df..42be139d 100644 --- a/scopesim/__init__.py +++ b/scopesim/__init__.py @@ -33,7 +33,7 @@ top_logger = logging.getLogger("astar") top_logger.setLevel(logging.WARNING) sim_logger = top_logger.getChild(__package__) -sim_logger.setLevel(logging.DEBUG) +sim_logger.setLevel(logging.INFO) formatter = logging.Formatter("%(name)s - %(levelname)s: %(message)s") log_dict = rc.__config__["!SIM.logging"] From bbde4f1a18e45a6f2f17d07fec1b5cf21704a1ba Mon Sep 17 00:00:00 2001 From: Hugo Buddelmeijer Date: Fri, 19 Jan 2024 13:33:09 +0100 Subject: [PATCH 2/3] Update scopesim/__init__.py Co-authored-by: teutoburg <73600109+teutoburg@users.noreply.github.com> --- scopesim/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scopesim/__init__.py b/scopesim/__init__.py index 42be139d..97946132 100644 --- a/scopesim/__init__.py +++ b/scopesim/__init__.py @@ -33,7 +33,8 @@ top_logger = logging.getLogger("astar") top_logger.setLevel(logging.WARNING) sim_logger = top_logger.getChild(__package__) -sim_logger.setLevel(logging.INFO) +sim_logger.setLevel(logging.DEBUG) +top_logger.propagate = False formatter = logging.Formatter("%(name)s - %(levelname)s: %(message)s") log_dict = rc.__config__["!SIM.logging"] From 42a9ed8d980fc5c20f43fdb1eb640c41ffd61fc2 Mon Sep 17 00:00:00 2001 From: teutoburg Date: Fri, 19 Jan 2024 13:53:31 +0100 Subject: [PATCH 3/3] Configure logging for tests --- scopesim/tests/conftest.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scopesim/tests/conftest.py b/scopesim/tests/conftest.py index 52469428..fab44def 100644 --- a/scopesim/tests/conftest.py +++ b/scopesim/tests/conftest.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- """Global fixtures for pytest.""" +import logging from pathlib import Path import pytest @@ -15,6 +16,20 @@ sim.rc.__currsys__["!SIM.file.error_on_missing_file"] = True +@pytest.fixture(scope="package", autouse=True) +def configure_logging(): + top_logger = logging.getLogger("astar") + handlers = top_logger.handlers + # Disable handlers + top_logger.handlers = [] + # Make sure logging can reach pytest's caplog + top_logger.propagate = True + yield + # Restore + top_logger.handlers = handlers + top_logger.propagate = False + + @pytest.fixture(scope="package") def mock_dir(): """Path to mock directory."""