sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-03 21:10:05 +00:00
Code Issues Projects Releases Wiki Activity

chore: fix for returning execute json

Browse Source
This commit is contained in:
Saad Jutt
2021-11-18 04:32:31 +05:00
parent b75139dda5
commit d2955645f0
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/scripts/systemInit.sas
View File

@@ -10,6 +10,4 @@
**/ **/
proc fcmp outcat=work.sasjs.utils; %mcf_stpsrv_header(wrap=YES, insert_cmplib=YES)
%mcf_stpsrv_header()
quit;

12
api/src/controllers/internal/Execution.ts
View File

@@ -101,6 +101,7 @@ ${program}`
typeof vars._debug === 'string' ? parseInt(vars._debug) : vars._debug typeof vars._debug === 'string' ? parseInt(vars._debug) : vars._debug
let debugResponse: string | undefined let debugResponse: string | undefined
if ((debugValue && debugValue >= 131) || session.crashed) { if ((debugValue && debugValue >= 131) || session.crashed) {
debugResponse = `<html><body>${webout}<div style="text-align:left"><hr /><h2>SAS Log</h2><pre>${log}</pre></div></body></html>` debugResponse = `<html><body>${webout}<div style="text-align:left"><hr /><h2>SAS Log</h2><pre>${log}</pre></div></body></html>`
} }
@@ -108,7 +109,16 @@ ${program}`
session.inUse = false session.inUse = false
sessionController.deleteSession(session) sessionController.deleteSession(session)
if (returnJson) return { result: debugResponse ?? webout, log } if (returnJson) {
const response: any = {
result: webout
}
if ((debugValue && debugValue >= 131) || session.crashed) {
response.log = log
}
return response
}
return debugResponse ?? webout return debugResponse ?? webout
} }