Skip to content
Snippets Groups Projects
Commit 6247e73b authored by Chris Hines's avatar Chris Hines
Browse files

test before push Chris

parent b6e4dff2
No related branches found
No related tags found
3 merge requests!77Revert "disable agressive kill and restart",!64Test,!62Dev
Pipeline #15809 passed
...@@ -212,7 +212,7 @@ def wrap_execute(sshsess, host, bastion=None, user=None, cmd=None): ...@@ -212,7 +212,7 @@ def wrap_execute(sshsess, host, bastion=None, user=None, cmd=None):
data = json.loads(res['stdout'].decode()) data = json.loads(res['stdout'].decode())
return data return data
except json.decoder.JSONDecodeError: 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: except Exception as e:
import traceback import traceback
logger.error(e) logger.error(e)
...@@ -398,10 +398,9 @@ class JobSubmit(Resource): ...@@ -398,10 +398,9 @@ class JobSubmit(Resource):
#flask_restful.abort(400, message='Incomplete job information was passed to the backend.') #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.') 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'],
res = wrap_execute(sshsess, host=params['identity']['site']['host'], user=params['identity']['username'], cmd=params['interface']['submitcmd'], stdin=script)
cmd=params['interface']['submitcmd'], stdin=script) return res
return res
except Exception as e: except Exception as e:
import traceback import traceback
logger.error(e) logger.error(e)
......
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