sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-15 01:40:05 +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

2
api/public/swagger.yaml
View File

@@ -1021,7 +1021,7 @@ paths:
type: string type: string
example: /Public/somefolder/some.file example: /Public/somefolder/some.file
requestBody: requestBody:
required: true required: false
content: content:
application/json: application/json:
schema: schema:

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

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

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

@@ -83,7 +83,7 @@ export class SessionController {
}) })
.catch((err) => { .catch((err) => {
session.completed = true session.completed = true
session.crashed = true session.crashed = err.toString()
console.log('session crashed', session.id, err) console.log('session crashed', session.id, err)
}) })
@@ -100,7 +100,9 @@ export class SessionController {
public async waitForSession(session: Session) { public async waitForSession(session: Session) {
const codeFilePath = path.join(session.path, 'code.sas') 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 session.ready = true
return Promise.resolve(session) return Promise.resolve(session)

5
api/src/controllers/stp.ts
View File

@@ -64,10 +64,10 @@ export class STPController {
@Post('/execute') @Post('/execute')
public async executeReturnJson( public async executeReturnJson(
@Request() request: express.Request, @Request() request: express.Request,
@Body() body: ExecuteReturnJsonPayload, @Body() body?: ExecuteReturnJsonPayload,
@Query() _program?: string @Query() _program?: string
): Promise<ExecuteReturnJsonResponse> { ): Promise<ExecuteReturnJsonResponse> {
const program = _program ?? body._program const program = _program ?? body?._program
return executeReturnJson(request, program!) return executeReturnJson(request, program!)
} }
} }
@@ -126,6 +126,7 @@ const executeReturnJson = async (
} }
} catch (err: any) { } catch (err: any) {
throw { throw {
code: 400,
status: 'failure', status: 'failure',
message: 'Job execution failed.', message: 'Job execution failed.',
error: typeof err === 'object' ? err.toString() : err error: typeof err === 'object' ? err.toString() : err

5
api/src/routes/api/stp.ts
View File

@@ -30,10 +30,9 @@ stpRouter.post(
fileUploadController.getMulterUploadObject().any(), fileUploadController.getMulterUploadObject().any(),
async (req: any, res: any) => { async (req: any, res: any) => {
const { error: errQ, value: query } = executeProgramRawValidation(req.query) const { error: errQ, value: query } = executeProgramRawValidation(req.query)
if (errQ) return res.status(400).send(errQ.details[0].message)
const { error: errB, value: body } = executeProgramRawValidation(req.body) const { error: errB, value: body } = executeProgramRawValidation(req.body)
if (errB) return res.status(400).send(errB.details[0].message)
if (errQ && errB) return res.status(400).send(errB.details[0].message)
try { try {
const response = await controller.executeReturnJson( const response = await controller.executeReturnJson(

2
api/src/types/Session.ts
View File

@@ -6,5 +6,5 @@ export interface Session {
path: string path: string
inUse: boolean inUse: boolean
completed: boolean completed: boolean
crashed?: boolean crashed?: string
} }