workers fix
This commit is contained in:
@@ -41,11 +41,11 @@ def run_migrations():
|
|||||||
con.execute(
|
con.execute(
|
||||||
"""
|
"""
|
||||||
CREATE TABLE IF NOT EXISTS workers (
|
CREATE TABLE IF NOT EXISTS workers (
|
||||||
worker_id TEXT PRIMARY KEY,
|
id TEXT PRIMARY KEY,
|
||||||
status TEXT,
|
status TEXT NOT NULL DEFAULT 'online',
|
||||||
last_seen_at TEXT,
|
started_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
last_seen_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
current_job_id INTEGER,
|
current_job_id INTEGER,
|
||||||
started_at TEXT,
|
|
||||||
metadata_json TEXT
|
metadata_json TEXT
|
||||||
)
|
)
|
||||||
"""
|
"""
|
||||||
|
|||||||
+6
-6
@@ -51,14 +51,14 @@ def get_workers():
|
|||||||
rows = con.execute(
|
rows = con.execute(
|
||||||
"""
|
"""
|
||||||
SELECT
|
SELECT
|
||||||
worker_id,
|
id,
|
||||||
status,
|
status,
|
||||||
|
started_at,
|
||||||
last_seen_at,
|
last_seen_at,
|
||||||
current_job_id,
|
current_job_id,
|
||||||
started_at,
|
|
||||||
metadata_json
|
metadata_json
|
||||||
FROM workers
|
FROM workers
|
||||||
ORDER BY worker_id
|
ORDER BY id
|
||||||
"""
|
"""
|
||||||
).fetchall()
|
).fetchall()
|
||||||
|
|
||||||
@@ -73,14 +73,14 @@ def get_worker(worker_id: str):
|
|||||||
row = con.execute(
|
row = con.execute(
|
||||||
"""
|
"""
|
||||||
SELECT
|
SELECT
|
||||||
worker_id,
|
id,
|
||||||
status,
|
status,
|
||||||
|
started_at,
|
||||||
last_seen_at,
|
last_seen_at,
|
||||||
current_job_id,
|
current_job_id,
|
||||||
started_at,
|
|
||||||
metadata_json
|
metadata_json
|
||||||
FROM workers
|
FROM workers
|
||||||
WHERE worker_id = ?
|
WHERE id = ?
|
||||||
""",
|
""",
|
||||||
(worker_id,),
|
(worker_id,),
|
||||||
).fetchone()
|
).fetchone()
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ def workers_page(request: Request, user=Depends(require_user)):
|
|||||||
|
|
||||||
rows = ""
|
rows = ""
|
||||||
for worker in workers:
|
for worker in workers:
|
||||||
worker_id_raw = worker.get("worker_id", "") or ""
|
worker_id_raw = worker.get("id", "") or ""
|
||||||
worker_id = html.escape(worker_id_raw)
|
worker_id = html.escape(worker_id_raw)
|
||||||
worker_url_id = quote(worker_id_raw, safe="")
|
worker_url_id = quote(worker_id_raw, safe="")
|
||||||
status = html.escape(worker.get("status", "") or "")
|
status = html.escape(worker.get("status", "") or "")
|
||||||
@@ -124,7 +124,7 @@ def worker_detail_page(worker_id: str, request: Request, user=Depends(require_us
|
|||||||
target_id=worker_id,
|
target_id=worker_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
worker_id_html = html.escape(worker.get("worker_id", "") or "")
|
worker_id_html = html.escape(worker.get("id", "") or "")
|
||||||
status = html.escape(worker.get("status", "") or "")
|
status = html.escape(worker.get("status", "") or "")
|
||||||
last_seen_at = html.escape(worker.get("last_seen_at", "") or "")
|
last_seen_at = html.escape(worker.get("last_seen_at", "") or "")
|
||||||
started_at = html.escape(worker.get("started_at", "") or "")
|
started_at = html.escape(worker.get("started_at", "") or "")
|
||||||
|
|||||||
Reference in New Issue
Block a user