From 4a06a108a95bbcba43b5cf673a3be826955ce72c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Sun, 18 Jan 2026 19:29:36 +0100 Subject: [PATCH] Adjustments --- apps/py-metadata/api/health_api.py | 14 +++++++++++--- apps/py-watcher/app.py | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/py-metadata/api/health_api.py b/apps/py-metadata/api/health_api.py index fd5376d3..38646907 100644 --- a/apps/py-metadata/api/health_api.py +++ b/apps/py-metadata/api/health_api.py @@ -22,7 +22,7 @@ async def health(): db_error = None worker_error = None - # Sjekk database + # --- Database check --- try: db.ping() db_ok = True @@ -30,10 +30,18 @@ async def health(): db_ok = False db_error = str(e) - # Sjekk worker heartbeat + # --- Worker heartbeat check --- try: last = get_worker_heartbeat() - worker_ok = (time.time() - last) < 10 + now = time.time() + diff = now - last + + worker_ok = diff < 10 + + # Hvis worker er false og ingen exception ble kastet → legg diff i worker_error + if not worker_ok and worker_error is None: + worker_error = f"Heartbeat too old: {diff:.2f}s" + except Exception as e: worker_ok = False worker_error = str(e) diff --git a/apps/py-watcher/app.py b/apps/py-watcher/app.py index 7a7bbd1e..9b8c8640 100644 --- a/apps/py-watcher/app.py +++ b/apps/py-watcher/app.py @@ -34,7 +34,8 @@ def get_heartbeat(): async def run_worker(db: Database, paths, extensions, shutdown_flag_ref): global observers - observers = [start_observer(db, [p], extensions, insert_event) for p in paths] + observers = [start_observer(db, p, extensions, insert_event) for p in paths] + try: while not shutdown_flag_ref():