From 452133c863f1326a6f0af5080a4861bd16f67fd7 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 23 Jun 2022 12:11:59 +0100
Subject: [PATCH] Store xfel-calibrate command in jobs database
---
webservice/webservice.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/webservice/webservice.py b/webservice/webservice.py
index 6df983bb0..aabc47020 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -59,6 +59,7 @@ def init_job_db(config):
CREATE TABLE IF NOT EXISTS executions(
exec_id INTEGER PRIMARY KEY,
req_id REFERENCES requests(req_id),
+ command TEXT,
det_type,
karabo_id,
success
@@ -1170,15 +1171,16 @@ class ActionsServer:
time_stamp=datetime.now().strftime('%y%m%d_%H%M%S'),
det_instance=karabo_id,
request_time=request_time
- ).split()
+ )
with self.job_db:
cur = self.job_db.execute(
- "INSERT INTO executions VALUES (NULL, ?, ?, ?, NULL)",
- (req_id, detector, karabo_id)
+ "INSERT INTO executions VALUES (NULL, ?, ?, ?, ?, NULL)",
+ (req_id, cmd, detector, karabo_id)
)
exec_id = cur.lastrowid
+ cmd = cmd.split()
cmd = parse_config(cmd, dconfig)
# TODO: Add detector info in returned run action status.
ret.append(await run_action(
--
GitLab