From 6ace7b25373ad044696696c44f9cad9b59ab4f98 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes <65790536+dan-fernandes@users.noreply.github.com> Date: Wed, 14 Jan 2026 10:46:41 +0000 Subject: [PATCH 1/7] Replace logging.info with LOGGER.info --- src/blueapi/cli/scratch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/blueapi/cli/scratch.py b/src/blueapi/cli/scratch.py index e81260326..c297e4ba1 100644 --- a/src/blueapi/cli/scratch.py +++ b/src/blueapi/cli/scratch.py @@ -15,6 +15,7 @@ _DEFAULT_INSTALL_TIMEOUT: float = 300.0 +LOGGER = logging.getLogger(__name__) def setup_scratch( config: ScratchConfig, install_timeout: float = _DEFAULT_INSTALL_TIMEOUT @@ -30,7 +31,7 @@ def setup_scratch( _validate_root_directory(config.root, config.required_gid) - logging.info(f"Setting up scratch area: {config.root}") + LOGGER.info(f"Setting up scratch area: {config.root}") """ fail early """ for repo in config.repositories: From af01394b97c4535fbc7c463dc5551473ba65ae42 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Wed, 14 Jan 2026 11:25:09 +0000 Subject: [PATCH 2/7] lint --- src/blueapi/cli/scratch.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/blueapi/cli/scratch.py b/src/blueapi/cli/scratch.py index c297e4ba1..c6d41a4e5 100644 --- a/src/blueapi/cli/scratch.py +++ b/src/blueapi/cli/scratch.py @@ -17,6 +17,7 @@ LOGGER = logging.getLogger(__name__) + def setup_scratch( config: ScratchConfig, install_timeout: float = _DEFAULT_INSTALL_TIMEOUT ) -> None: From 580e0d8e533e664ffbeeeb50a8e03bca4be5c101 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Wed, 14 Jan 2026 14:38:38 +0000 Subject: [PATCH 3/7] Fix logging.info in cli --- src/blueapi/cli/cli.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/blueapi/cli/cli.py b/src/blueapi/cli/cli.py index c39ff13df..e70922b9c 100644 --- a/src/blueapi/cli/cli.py +++ b/src/blueapi/cli/cli.py @@ -42,6 +42,8 @@ from .scratch import setup_scratch from .updates import CliEventRenderer +LOGGER = logging.getLogger(__name__) + @click.group( invoke_without_command=True, context_settings={"auto_envvar_prefix": "BLUEAPI"} @@ -493,7 +495,7 @@ def logout(obj: dict) -> None: except FileNotFoundError: print("Logged out") except ValueError as e: - logging.debug("Invalid login token: %s", e) + LOGGER.debug("Invalid login token: %s", e) raise ClickException( "Login token is not valid - remove before trying again" ) from e From 9dfa17d381df81c22d35a9c5c50d7b5baf995fd7 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Wed, 14 Jan 2026 14:39:12 +0000 Subject: [PATCH 4/7] Fix logging.info in scratch --- src/blueapi/cli/scratch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blueapi/cli/scratch.py b/src/blueapi/cli/scratch.py index c6d41a4e5..5011819f9 100644 --- a/src/blueapi/cli/scratch.py +++ b/src/blueapi/cli/scratch.py @@ -66,12 +66,12 @@ def ensure_repo(remote_url: str, local_directory: Path) -> None: os.umask(stat.S_IWOTH) if not local_directory.exists(): - logging.info(f"Cloning {remote_url}") + LOGGER.info(f"Cloning {remote_url}") Repo.clone_from(remote_url, local_directory) - logging.info(f"Cloned {remote_url} -> {local_directory}") + LOGGER.info(f"Cloned {remote_url} -> {local_directory}") elif local_directory.is_dir(): Repo(local_directory) - logging.info(f"Found {local_directory}") + LOGGER.info(f"Found {local_directory}") else: raise KeyError( f"Unable to open {local_directory} as a git repository because it is a file" @@ -92,7 +92,7 @@ def scratch_install(path: Path, timeout: float = _DEFAULT_INSTALL_TIMEOUT) -> No _validate_directory(path) - logging.info(f"Installing {path}") + LOGGER.info(f"Installing {path}") process = Popen( [ "uv", From 98c0f1ea0c4cee4f75f79167e8432890fc05fbbf Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Wed, 14 Jan 2026 14:39:49 +0000 Subject: [PATCH 5/7] Fix logging.debug in numtracker --- src/blueapi/client/numtracker.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/blueapi/client/numtracker.py b/src/blueapi/client/numtracker.py index 3ec7a9ab8..9fb83ec95 100644 --- a/src/blueapi/client/numtracker.py +++ b/src/blueapi/client/numtracker.py @@ -8,6 +8,8 @@ from blueapi.utils import BlueapiBaseModel +LOGGER = logging.getLogger(__name__) + class DirectoryPath(BlueapiBaseModel): """ @@ -105,5 +107,5 @@ def create_scan( raise RuntimeError(f"Numtracker error: {json['errors']}") new_collection = NumtrackerScanMutationResponse.model_validate(json["data"]) - logging.debug("New NumtrackerNewScan: %s", new_collection) + LOGGER.debug("New NumtrackerNewScan: %s", new_collection) return new_collection From 6aaa9f1a12aa80e8bc4787e03c5c79b6fe92b70a Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Wed, 14 Jan 2026 14:40:18 +0000 Subject: [PATCH 6/7] Fix logging.warning in task_worker --- src/blueapi/worker/task_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/blueapi/worker/task_worker.py b/src/blueapi/worker/task_worker.py index 06055cc93..62435d261 100644 --- a/src/blueapi/worker/task_worker.py +++ b/src/blueapi/worker/task_worker.py @@ -273,7 +273,7 @@ def submit_task(self, task: Task) -> str: request_id = get_baggage("correlation_id") # If request id is not a string, we do not pass it into a TrackableTask if not isinstance(request_id, str): - logging.warning(f"Invalid correlation id detected: {request_id}") + LOGGER.warning(f"Invalid correlation id detected: {request_id}") request_id = None trackable_task = TrackableTask( task_id=task_id, From e8f131c621080f4ab07c532c807ec183ddba4a19 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Wed, 14 Jan 2026 14:42:06 +0000 Subject: [PATCH 7/7] Capitalise logger in docs --- docs/how-to/configure-logging.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/how-to/configure-logging.md b/docs/how-to/configure-logging.md index 845c64cd2..198c1b3fb 100644 --- a/docs/how-to/configure-logging.md +++ b/docs/how-to/configure-logging.md @@ -25,8 +25,8 @@ BlueAPI is configured to handle logging from any python code it executes. ``` import logging -logger = logging.getLogger(__name__) -logger.info("FOO") +LOGGER = logging.getLogger(__name__) +LOGGER.info("FOO") ``` # Kubernetes