From af4290b6eabc1a96122163c539ceb6b43efc99ea Mon Sep 17 00:00:00 2001 From: Christian Meesters Date: Thu, 6 Nov 2025 12:24:14 +0100 Subject: [PATCH 1/2] fix: speaking of SLURM logs to differentiate between SLURM and Snakemake logs --- snakemake_executor_plugin_slurm/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snakemake_executor_plugin_slurm/__init__.py b/snakemake_executor_plugin_slurm/__init__.py index 583b077..eeb26b2 100644 --- a/snakemake_executor_plugin_slurm/__init__.py +++ b/snakemake_executor_plugin_slurm/__init__.py @@ -231,7 +231,7 @@ def clean_old_logs(self) -> None: return cutoff_secs = age_cutoff * 86400 current_time = time.time() - self.logger.info(f"Cleaning up log files older than {age_cutoff} day(s).") + self.logger.info(f"Cleaning up SLURM log files older than {age_cutoff} day(s).") for path in self.slurm_logdir.rglob("*.log"): if path.is_file(): @@ -525,7 +525,7 @@ async def check_active_jobs( active_jobs_seen_by_sacct.remove(j.external_jobid) if not self.workflow.executor_settings.keep_successful_logs: self.logger.debug( - "removing log for successful job " + "removing SLURMlog for successful job " f"with SLURM ID '{j.external_jobid}'" ) try: @@ -533,7 +533,7 @@ async def check_active_jobs( j.aux["slurm_logfile"].unlink() except (OSError, FileNotFoundError) as e: self.logger.warning( - "Could not remove log file" + "Could not remove SLURM log file" f" {j.aux['slurm_logfile']}: {e}" ) elif status == "PREEMPTED" and not self._preemption_warning: From ef2fb1a6536842a7260493d9b09f27914c5052a0 Mon Sep 17 00:00:00 2001 From: Christian Meesters Date: Fri, 7 Nov 2025 09:41:34 +0000 Subject: [PATCH 2/2] Update snakemake_executor_plugin_slurm/__init__.py Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- snakemake_executor_plugin_slurm/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snakemake_executor_plugin_slurm/__init__.py b/snakemake_executor_plugin_slurm/__init__.py index eeb26b2..aa952e2 100644 --- a/snakemake_executor_plugin_slurm/__init__.py +++ b/snakemake_executor_plugin_slurm/__init__.py @@ -525,7 +525,7 @@ async def check_active_jobs( active_jobs_seen_by_sacct.remove(j.external_jobid) if not self.workflow.executor_settings.keep_successful_logs: self.logger.debug( - "removing SLURMlog for successful job " + "removing SLURM log for successful job " f"with SLURM ID '{j.external_jobid}'" ) try: