3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

history: add check for interrupted jobs 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-12-27 06:21:18 -05:00
parent ee0c641b08
commit 09b6a33ae4
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
moonraker/components/history.py
View File

@ -25,6 +25,7 @@ if TYPE_CHECKING:
from .file_manager.file_manager import FileManager
HIST_NAMESPACE = "history"
HIST_VERSION = 1
MAX_JOBS = 10000
class History:
@ -79,6 +80,29 @@ class History:
if self.cached_job_ids:
self.next_job_id = int(self.cached_job_ids[-1], 16) + 1
async def component_init(self) -> None:
# Check for interupted jobs. If this is the first time, check
# the entire database. Otherwise only check the last 20 jobs.
interrupted_jobs: Dict[str, Any] = {}
database: DBComp = self.server.lookup_component("database")
version: int = await database.get_item("moonraker", "history.version", 0)
if version != HIST_VERSION:
await database.insert_item("moonraker", "history.version", HIST_VERSION)
job_ids = self.cached_job_ids if version < 1 else self.cached_job_ids[-20:]
jobs: Dict[str, Dict[str, Any]]
jobs = await self.history_ns.get_batch(job_ids)
for jid, job_data in jobs.items():
if job_data.get("status", "") == "in_progress":
job_data["status"] = "interrupted"
interrupted_jobs[jid] = job_data
if interrupted_jobs:
self.server.add_log_rollover_item(
"interrupted_history",
"The following jobs were detected as interrupted: "
f"{list(interrupted_jobs.keys())}"
)
await self.history_ns.insert_batch(interrupted_jobs)
async def _handle_job_request(self,
web_request: WebRequest
) -> Dict[str, Any]: