read log basedir from context in worker pools

This prevents tests from using the default log base dir for workers

daisy/logging.py

@@ -22,6 +22,7 @@ def set_log_basedir(path):
     else:
         LOG_BASEDIR = None
 
+
 def get_log_basedir():
     """Get the base directory for logging."""
     global LOG_BASEDIR
@@ -30,12 +31,10 @@ def get_log_basedir():
 
 def get_worker_log_basename(worker_id, task_id=None):
     """Get the basename of log files for individual workers."""
-    global LOG_BASEDIR
-
-    if LOG_BASEDIR is None:
-        return None
 
-    basename = LOG_BASEDIR
+    basename = get_log_basedir()
+    if basename is None:
+        return None
     if task_id is not None:
         basename /= task_id
     basename /= f"worker_{worker_id}"
@@ -64,7 +63,6 @@ def redirect_stdouterr(basename, mode="w"):
 
 
 def _file_reopen(filename, mode, file_obj):
-
     new = open(filename, mode)
     newfd = new.fileno()
     targetfd = file_obj.fileno()

daisy/server.py

@@ -2,7 +2,6 @@
 from .block import BlockStatus
 from .block_bookkeeper import BlockBookkeeper
 from .context import Context
-from .logging import get_log_basedir
 from .messages import (
     AcquireBlock,
     BlockFailed,

daisy/task_worker_pools.py

@@ -1,5 +1,4 @@
 from .context import Context
-from .logging import get_log_basedir
 from .server_observer import ServerObserver
 from .worker_pool import WorkerPool
 import logging

daisy/worker.py

@@ -91,6 +91,8 @@ def _spawn_wrapper(self):
         try:
 
             os.environ[self.context.ENV_VARIABLE] = self.context.to_env()
+            log_base = self.context.get("logdir", daisy_logging.get_log_basedir())
+            daisy_logging.set_log_basedir(log_base)
 
             log_base = daisy_logging.get_worker_log_basename(
                 self.worker_id, self.context.get("task_id", None)

tests/conftest.py

@@ -0,0 +1,8 @@
+import pytest
+
+from daisy.logging import set_log_basedir
+
+
+@pytest.fixture(autouse=True)
+def logdir(tmp_path):
+    set_log_basedir(tmp_path / "daisy_logs")