Skip to content
Snippets Groups Projects
Commit 48e03999 authored by Thomas Kluyver's avatar Thomas Kluyver
Browse files

Add command to database after extending with parameters

parent dacb2cfc
No related branches found
No related tags found
1 merge request!683[Webservice] Restructure database to give more meaningful success/failure information
...@@ -8,6 +8,7 @@ import json ...@@ -8,6 +8,7 @@ import json
import locale import locale
import logging import logging
import os import os
import shlex
import sqlite3 import sqlite3
import sys import sys
import urllib.parse import urllib.parse
...@@ -1171,17 +1172,16 @@ class ActionsServer: ...@@ -1171,17 +1172,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()
cmd = parse_config(cmd, dconfig)
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, cmd, detector, karabo_id) (req_id, shlex.join(cmd), detector, karabo_id)
) )
exec_id = cur.lastrowid exec_id = cur.lastrowid
cmd = cmd.split()
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(
self.job_db, cmd, self.mode, self.job_db, cmd, self.mode,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment