From 04d34fdf3268025d227cd35a3fe1bebfea8ebba8 Mon Sep 17 00:00:00 2001 From: Michael Woods Date: Sun, 28 Dec 2025 12:04:08 -0500 Subject: [PATCH] A couple other tweaks. --- packetserver/runner/__init__.py | 3 +++ packetserver/runner/podman.py | 1 - packetserver/server/__init__.py | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packetserver/runner/__init__.py b/packetserver/runner/__init__.py index 95ec17c..65a3014 100644 --- a/packetserver/runner/__init__.py +++ b/packetserver/runner/__init__.py @@ -156,6 +156,7 @@ class Orchestrator: self.runners = [] self.runner_lock = Lock() self.listeners = [] + self.started: bool = False def get_finished_runners(self) -> list[Runner]: return [r for r in self.runners if r.is_finished()] @@ -195,8 +196,10 @@ class Orchestrator: def start(self): """Do any setup and then be ready to operate""" + self.started = True pass def stop(self): """Do any cleanup needed.""" + self.started = False pass \ No newline at end of file diff --git a/packetserver/runner/podman.py b/packetserver/runner/podman.py index 397d2cc..fe72148 100644 --- a/packetserver/runner/podman.py +++ b/packetserver/runner/podman.py @@ -167,7 +167,6 @@ class PodmanRunner(Runner): class PodmanOrchestrator(Orchestrator): def __init__(self, uri: Optional[str] = None, options: Optional[PodmanOptions] = None): super().__init__() - self.started = False self.user_containers = {} self.manager_thread = None self._client = None diff --git a/packetserver/server/__init__.py b/packetserver/server/__init__.py index 0eb6a4d..a3e18d9 100644 --- a/packetserver/server/__init__.py +++ b/packetserver/server/__init__.py @@ -233,6 +233,11 @@ class Server: self.ping_job_queue() if (self.orchestrator is not None) and self.orchestrator.started and self.check_job_queue: with self.db.transaction() as storage: + if 'job_check_interval' in storage.root.config: + try: + self.job_check_interval = int(storage.root.config['job_check_interval']) + except: + logging.warning(f"Invalid config value for 'job_check_interval'") # queue as many jobs as possible while self.orchestrator.runners_available(): if len(storage.root.job_queue) > 0: