diff options
| -rw-r--r-- | qc_app/dbinsert.py | 5 | ||||
| -rw-r--r-- | qc_app/static/css/styles.css | 13 | ||||
| -rw-r--r-- | qc_app/templates/insert_progress.html | 9 | ||||
| -rw-r--r-- | scripts/insert_data.py | 5 | ||||
| -rw-r--r-- | scripts/worker.py | 15 |
5 files changed, 36 insertions, 11 deletions
diff --git a/qc_app/dbinsert.py b/qc_app/dbinsert.py index 70aeb6d..589ac75 100644 --- a/qc_app/dbinsert.py +++ b/qc_app/dbinsert.py @@ -396,7 +396,10 @@ def insert_status(job_id: str): job = jobs.job(rconn, job_id) if job: - if job["status"] == "success": + job_status = job["status"] + if job_status == "success": return render_template("insert_success.html", job=job) + if job["status"] == "error": + return render_template("insert_error.html", job=job) return render_template("insert_progress.html", job=job) return render_template("no_such_job.html", job_id=job_id), 400 diff --git a/qc_app/static/css/styles.css b/qc_app/static/css/styles.css index 5340701..d20c1fb 100644 --- a/qc_app/static/css/styles.css +++ b/qc_app/static/css/styles.css @@ -2,6 +2,10 @@ box-sizing: border-box; } +body { + padding: 0 1em 0 1em; +} + label, legend { text-transform: capitalize; } @@ -130,3 +134,12 @@ form legend { font-weight: bolder; line-height: 2em; } + +.cli-output { + background: black; + color: #00DD00; + padding: 1em; + font-weight: bold; + border-radius: 0.8em; + width: 55em; +} diff --git a/qc_app/templates/insert_progress.html b/qc_app/templates/insert_progress.html index 1ac6212..52beaa4 100644 --- a/qc_app/templates/insert_progress.html +++ b/qc_app/templates/insert_progress.html @@ -1,4 +1,5 @@ {%extends "base.html"%} +{%from "stdout_output.html" import stdout_output%} {%block extrameta%} <meta http-equiv="refresh" content="5"> @@ -7,18 +8,16 @@ {%block title%}Job Status{%endblock%} {%block contents%} -<h1 class="heading">{{job_name}}</h2> +<h1 class="heading">{{job_name}}</h1> <label for="job_status">status:</label> <span>{{job_status}}: {{message}}</span><br /> -{{job}} <label for="job_{{job_id}}">inserting: </label> <progress id="job_{{job_id}}" value="{{(job['percent'] | float) / 100}}">{{job["percent"]}}</progress> <span>{{"%.2f" | format(job['percent'] | float)}}%</span> -<div> - {{job.stderr}} -</div> + +{{stdout_output(job)}} {%endblock%} diff --git a/scripts/insert_data.py b/scripts/insert_data.py index 6491b06..7bf20f1 100644 --- a/scripts/insert_data.py +++ b/scripts/insert_data.py @@ -122,7 +122,9 @@ def __format_query__(query, params): for param in params) values_str = ", ".join( f"('{__param_str__(value_tup)}')" for value_tup in values) - return f"{query[:idx]} VALUES{values_str};" + insert_str = query[:idx].replace( + "INSERT INTO ", "INSERT INTO\n\t") + return f"{insert_str}\nVALUES\n\t{values_str};" def insert_means( filepath: str, speciesid: int, datasetid: int, dbconn: mdb.Connection, @@ -149,6 +151,7 @@ def insert_means( if not bool(means): break print(__format_query__(means_query, means)) + print() print(__format_query__(xref_query, means)) cursor.executemany(means_query, means) cursor.executemany(xref_query, means) diff --git a/scripts/worker.py b/scripts/worker.py index 03751d2..391f522 100644 --- a/scripts/worker.py +++ b/scripts/worker.py @@ -27,13 +27,16 @@ def parse_args(): return args -def update_stdout_stderr(bytes_read, stream: str, rconn, job_id): +def update_stdout_stderr(rconn, job_id, bytes_read, stream: str): "Update the stdout/stderr keys according to the value of `stream`." job = jobs.job(rconn, job_id) contents = job.get(stream, '') new_contents = contents + bytes_read.decode("utf-8") rconn.hset(name=job_id, key=stream, value=new_contents) +def update_status(rconn, job_id, status): + rconn.hset(name=job_id, key="status", value=status) + def run_job(job, rconn): "Run the actual job." job_id = job["job_id"] @@ -45,18 +48,22 @@ def run_job(job, rconn): shlex.split(job["command"]), stdout=subprocess.PIPE, stderr=tmpfl) as process: while process.poll() is None: + update_status(rconn, job_id, "running") update_stdout_stderr( - process.stdout.read1(), "stdout", rconn, job_id) + rconn, job_id, process.stdout.read1(), "stdout") sleep(1) with open(stderrpath, "rb") as stderr: - update_stdout_stderr(stderr.read(), "stderr", rconn, job_id) + stderr_content = stderr.read() + update_stdout_stderr(rconn, job_id, stderr_content, "stderr") + update_status(rconn, job_id, ("error" if bool(stderr_content) else "success")) os.remove(stderrpath) return process.poll() except Exception as exc:# pylint: disable=[broad-except,unused-variable] + update_status(rconn, job_id, "error") update_stdout_stderr( - traceback.format_exc().encode("utf-8"), "stderr", rconn, job_id) + rconn, job_id, traceback.format_exc().encode("utf-8"), "stderr") print(traceback.format_exc(), file=sys.stderr) sys.exit(4) |