diff options
| author | Peter Amstutz | 2020-07-16 14:48:22 -0400 |
|---|---|---|
| committer | Peter Amstutz | 2020-07-16 14:48:22 -0400 |
| commit | d34374f0e822edd1539ea5de6f8522f2b761de3f (patch) | |
| tree | 1bcdb209a7fc26eae76da4240564e53875afa2ae /bh20simplewebuploader | |
| parent | 474d15e17be63046a091615e89ba63adecdb109b (diff) | |
| download | bh20-seq-resource-d34374f0e822edd1539ea5de6f8522f2b761de3f.tar.gz bh20-seq-resource-d34374f0e822edd1539ea5de6f8522f2b761de3f.tar.lz bh20-seq-resource-d34374f0e822edd1539ea5de6f8522f2b761de3f.zip | |
Improve uploader reporting.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
Diffstat (limited to 'bh20simplewebuploader')
| -rw-r--r-- | bh20simplewebuploader/main.py | 4 | ||||
| -rw-r--r-- | bh20simplewebuploader/templates/error.html | 2 | ||||
| -rw-r--r-- | bh20simplewebuploader/templates/success.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bh20simplewebuploader/main.py b/bh20simplewebuploader/main.py index 62b68d9..c814f30 100644 --- a/bh20simplewebuploader/main.py +++ b/bh20simplewebuploader/main.py @@ -445,12 +445,12 @@ def receive_files(): if result.returncode != 0: # It didn't work. Complain. - error_message="Uploader returned value {} and said:".format(result.returncode) + str(result.stderr.decode('utf-8')) + error_message="Uploader returned value {} and said:\n".format(result.returncode) + str(result.stderr.decode('utf-8')) print(error_message, file=sys.stderr) return (render_template('error.html', error_message=error_message), 403) else: # It worked. Say so. - return render_template('success.html', log=result.stdout.decode('utf-8', errors='replace')) + return render_template('success.html', log=result.stderr.decode('utf-8', errors='replace')) finally: shutil.rmtree(dest_dir) diff --git a/bh20simplewebuploader/templates/error.html b/bh20simplewebuploader/templates/error.html index b1d9402..fc08aed 100644 --- a/bh20simplewebuploader/templates/error.html +++ b/bh20simplewebuploader/templates/error.html @@ -15,7 +15,7 @@ </pre> </p> <p> - <a href="/">Click here to try again.</a> + <a href="/upload">Click here to try again.</a> </p> <hr> </body> diff --git a/bh20simplewebuploader/templates/success.html b/bh20simplewebuploader/templates/success.html index 9f0987c..c2302fa 100644 --- a/bh20simplewebuploader/templates/success.html +++ b/bh20simplewebuploader/templates/success.html @@ -9,7 +9,7 @@ <h1>Upload Successful</h1> <hr> <p> - Your files have been uploaded. They should soon appear as output of the <a href="/download">Public SARS-CoV-2 Sequence Resource</a>. + Your files have been uploaded. You can track their <a href="/status">QC status</a>, once validated they will be part of the <a href="/download">Public SARS-CoV-2 Sequence Resource</a>. </p> <p> The upload log was: |