mirror of https://git.48k.eu/ogclient
rest: add cmd field to POST /shell/run
echo command that has been run for storage in ogserver, until GET /shell/output is invoked.master
parent
19cd1b9a78
commit
1c9a13cd96
|
|
@ -297,7 +297,7 @@ class OgLiveOperations:
|
||||||
|
|
||||||
self.refresh(ogRest)
|
self.refresh(ogRest)
|
||||||
|
|
||||||
return (ogRest.proc.returncode, output.decode('utf-8'))
|
return (ogRest.proc.returncode, " ".join(cmds), output.decode('utf-8'))
|
||||||
|
|
||||||
def session(self, request, ogRest):
|
def session(self, request, ogRest):
|
||||||
disk = request.getDisk()
|
disk = request.getDisk()
|
||||||
|
|
|
||||||
|
|
@ -92,13 +92,14 @@ class ogThread():
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
(retcode, shellout) = ogRest.operations.shellrun(request, ogRest)
|
(retcode, cmd, shellout) = ogRest.operations.shellrun(request, ogRest)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
ogRest.send_internal_server_error(client, exc=e)
|
ogRest.send_internal_server_error(client, exc=e)
|
||||||
return
|
return
|
||||||
|
|
||||||
if request.getEcho():
|
if request.getEcho():
|
||||||
json_body = jsonBody()
|
json_body = jsonBody()
|
||||||
|
json_body.add_element('cmd', cmd)
|
||||||
json_body.add_element('out', shellout)
|
json_body.add_element('out', shellout)
|
||||||
json_body.add_element('retcode', retcode)
|
json_body.add_element('retcode', retcode)
|
||||||
response = restResponse(ogResponses.OK, json_body, seq=client.seq)
|
response = restResponse(ogResponses.OK, json_body, seq=client.seq)
|
||||||
|
|
|
||||||
|
|
@ -240,7 +240,7 @@ class OgVirtualOperations:
|
||||||
self.poweroff_host()
|
self.poweroff_host()
|
||||||
|
|
||||||
def shellrun(self, request, ogRest):
|
def shellrun(self, request, ogRest):
|
||||||
return (0, "")
|
return (0, "", "")
|
||||||
|
|
||||||
def session(self, request, ogRest):
|
def session(self, request, ogRest):
|
||||||
disk = request.getDisk()
|
disk = request.getDisk()
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,7 @@ class OgWindowsOperations:
|
||||||
if error.stdout:
|
if error.stdout:
|
||||||
return error.stdout
|
return error.stdout
|
||||||
return "{Non zero exit code and empty output}"
|
return "{Non zero exit code and empty output}"
|
||||||
return (result.returncode, result.stdout)
|
return (result.returncode, cmd, result.stdout)
|
||||||
|
|
||||||
def session(self, request, ogRest):
|
def session(self, request, ogRest):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue