Add env var for logging level

boefjes/boefjes/clients/scheduler_client.py

@@ -5,6 +5,7 @@
 from httpx import Client, HTTPTransport, Response
 from pydantic import BaseModel, TypeAdapter
 
+from boefjes.config import settings
 from boefjes.job_models import BoefjeMeta, NormalizerMeta
 
 
@@ -57,7 +58,7 @@ def push_item(self, p_item: Task) -> None:
 
 class SchedulerAPIClient(SchedulerClientInterface):
     def __init__(self, base_url: str):
-        self._session = Client(base_url=base_url, transport=HTTPTransport(retries=6))
+        self._session = Client(base_url=base_url, transport=HTTPTransport(retries=6), timeout=settings.httpx_timeout)
 
     @staticmethod
     def _verify_response(response: Response) -> None:

boefjes/boefjes/config.py

@@ -122,6 +122,8 @@ class Settings(BaseSettings):
 
     logging_format: Literal["text", "json"] = Field("text", description="Logging format")
 
+    httpx_timeout: int = Field(30, description="httpx timeout")
+
     model_config = SettingsConfigDict(env_prefix="BOEFJES_")
 
     @classmethod

boefjes/boefjes/job_handler.py

@@ -49,9 +49,7 @@ def get_environment_settings(boefje_meta: BoefjeMeta, schema: dict | None = None
 
     allowed_keys = schema.get("properties", []) if schema else []
     new_env = {
-        key.split("BOEFJE_", 1)[1]: value
-        for key, value in os.environ.items()
-        if key.startswith("BOEFJE_") and key in allowed_keys
+        key[7:]: value for key, value in os.environ.items() if key.startswith("BOEFJE_") and key[7:] not in allowed_keys
     }
 
     settings_from_katalogus = response.json()

mula/scheduler/config/settings.py

@@ -48,6 +48,7 @@ class Settings(BaseSettings):
     debug: bool = Field(False, alias="DEBUG", description="Enables/disables global debugging mode")
 
     log_cfg: Path = Field(BASE_DIR / "logging.json", description="Path to the logging configuration file")
+    log_level: str = Field("INFO", description="Logging level")
 
     collect_metrics: bool = Field(
         False, description="Enables/disables the collection of metrics to be used with tools like Prometheus"

mula/scheduler/context/context.py

@@ -42,6 +42,14 @@ def __init__(self) -> None:
         with Path(self.config.log_cfg).open("rt", encoding="utf-8") as f:
             logging.config.dictConfig(json.load(f))
 
+        # Set the logging level to the value specified by the env var
+        level = logging.getLevelName(self.config.log_level.upper())
+        root_logger = logging.getLogger()
+        root_logger.setLevel(level)
+        root_logger.handlers[0].setLevel(level)
+        logging.getLogger("uvicorn.access").setLevel(level)
+        logging.getLogger("uvicorn.error").setLevel(level)
+
         # Check if we enabled structured logging in the configuration
         if self.config.logging_format == "json":
             structlog.configure(