Skip to content
Snippets Groups Projects

[Webservice] Restructure database to give more meaningful success/failure information

Merged Thomas Kluyver requested to merge webservice-refactor-db into master
1 file
+ 5
3
Compare changes
  • Side-by-side
  • Inline
+ 5
3
@@ -59,6 +59,7 @@ def init_job_db(config):
@@ -59,6 +59,7 @@ def init_job_db(config):
CREATE TABLE IF NOT EXISTS executions(
CREATE TABLE IF NOT EXISTS executions(
exec_id INTEGER PRIMARY KEY,
exec_id INTEGER PRIMARY KEY,
req_id REFERENCES requests(req_id),
req_id REFERENCES requests(req_id),
 
command TEXT,
det_type,
det_type,
karabo_id,
karabo_id,
success
success
@@ -1170,15 +1171,16 @@ class ActionsServer:
@@ -1170,15 +1171,16 @@ class ActionsServer:
time_stamp=datetime.now().strftime('%y%m%d_%H%M%S'),
time_stamp=datetime.now().strftime('%y%m%d_%H%M%S'),
det_instance=karabo_id,
det_instance=karabo_id,
request_time=request_time
request_time=request_time
).split()
)
with self.job_db:
with self.job_db:
cur = self.job_db.execute(
cur = self.job_db.execute(
"INSERT INTO executions VALUES (NULL, ?, ?, ?, NULL)",
"INSERT INTO executions VALUES (NULL, ?, ?, ?, ?, NULL)",
(req_id, detector, karabo_id)
(req_id, cmd, detector, karabo_id)
)
)
exec_id = cur.lastrowid
exec_id = cur.lastrowid
 
cmd = cmd.split()
cmd = parse_config(cmd, dconfig)
cmd = parse_config(cmd, dconfig)
# TODO: Add detector info in returned run action status.
# TODO: Add detector info in returned run action status.
ret.append(await run_action(
ret.append(await run_action(
Loading