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
OpenGnSys Support Team 2024-06-21 14:59:22 +02:00
parent 19cd1b9a78
commit 1c9a13cd96
4 changed files with 5 additions and 4 deletions

View File

@ -297,7 +297,7 @@ class OgLiveOperations:
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):
disk = request.getDisk()

View File

@ -92,13 +92,14 @@ class ogThread():
return
try:
(retcode, shellout) = ogRest.operations.shellrun(request, ogRest)
(retcode, cmd, shellout) = ogRest.operations.shellrun(request, ogRest)
except Exception as e:
ogRest.send_internal_server_error(client, exc=e)
return
if request.getEcho():
json_body = jsonBody()
json_body.add_element('cmd', cmd)
json_body.add_element('out', shellout)
json_body.add_element('retcode', retcode)
response = restResponse(ogResponses.OK, json_body, seq=client.seq)

View File

@ -240,7 +240,7 @@ class OgVirtualOperations:
self.poweroff_host()
def shellrun(self, request, ogRest):
return (0, "")
return (0, "", "")
def session(self, request, ogRest):
disk = request.getDisk()

View File

@ -93,7 +93,7 @@ class OgWindowsOperations:
if error.stdout:
return error.stdout
return "{Non zero exit code and empty output}"
return (result.returncode, result.stdout)
return (result.returncode, cmd, result.stdout)
def session(self, request, ogRest):
raise NotImplementedError