sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-11 08:20:04 +00:00
Code Issues Projects Releases Wiki Activity

chore: bug fixes for session crash details + return code

Browse Source
This commit is contained in:
Saad Jutt
2021-11-15 21:30:12 +05:00
parent 9ee7951816
commit f030aa1516
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,11 +74,13 @@ ${program}`
await moveFile(codePath + '.bkp', codePath)
// we now need to poll the session array
while (!session.completed || !session.crashed) {
while (!session.completed) {
await delay(50)
}
const log = (await fileExists(logPath)) ? await readFile(logPath) : ''
const log =
((await fileExists(logPath)) ? await readFile(logPath) : '') +
session.crashed
const webout = (await fileExists(weboutPath))
? await readFile(weboutPath)
: ''

6
api/src/controllers/internal/Session.ts
View File

@@ -83,7 +83,7 @@ export class SessionController {
})
.catch((err) => {
session.completed = true
session.crashed = true
session.crashed = err.toString()
console.log('session crashed', session.id, err)
})
@@ -100,7 +100,9 @@ export class SessionController {
public async waitForSession(session: Session) {
const codeFilePath = path.join(session.path, 'code.sas')
while (await fileExists(codeFilePath)) {}
// TODO: don't wait forever
while ((await fileExists(codeFilePath)) && !session.crashed) {}
console.log('session crashed?', !!session.crashed, session.crashed)
session.ready = true
return Promise.resolve(session)