From 6247e73b138ba465fc989f6bb559d6e723bc67fc Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Fri, 26 Feb 2021 16:39:16 +1100
Subject: [PATCH] test before push Chris
---
tes/apiendpoints.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/tes/apiendpoints.py b/tes/apiendpoints.py
index d4b133c..cfd9047 100644
--- a/tes/apiendpoints.py
+++ b/tes/apiendpoints.py
@@ -212,7 +212,7 @@ def wrap_execute(sshsess, host, bastion=None, user=None, cmd=None):
data = json.loads(res['stdout'].decode())
return data
except json.decoder.JSONDecodeError:
- return apiabort(500, data = {'stdout':res['stdout']},'stderr':res['stderr']})
+ return apiabort(500, data = {'stdout':res['stdout'],'stderr':res['stderr']})
except Exception as e:
import traceback
logger.error(e)
@@ -398,10 +398,9 @@ class JobSubmit(Resource):
#flask_restful.abort(400, message='Incomplete job information was passed to the backend.')
return apiabort(400, message='Incomplete job information was passed to the backend.')
- try:
- res = wrap_execute(sshsess, host=params['identity']['site']['host'], user=params['identity']['username'],
- cmd=params['interface']['submitcmd'], stdin=script)
- return res
+ res = wrap_execute(sshsess, host=params['identity']['site']['host'], user=params['identity']['username'],
+ cmd=params['interface']['submitcmd'], stdin=script)
+ return res
except Exception as e:
import traceback
logger.error(e)
--
GitLab