From a6f68975431eb15331c5cd9a511f7054eb9a58c7 Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Sun, 20 Feb 2022 20:50:38 +0500 Subject: [PATCH] fix: adopted new log structure of SASJS server --- src/job-execution/SasJsJobExecutor.ts | 6 +++++- src/job-execution/WebJobExecutor.ts | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/job-execution/SasJsJobExecutor.ts b/src/job-execution/SasJsJobExecutor.ts index 5a884ae..1d52832 100644 --- a/src/job-execution/SasJsJobExecutor.ts +++ b/src/job-execution/SasJsJobExecutor.ts @@ -52,9 +52,13 @@ export class SasJsJobExecutor extends BaseJobExecutor { authConfig?.access_token ) .then(async (res: any) => { + const parsedSasjsServerLog = res.result.log + .map((logLine: any) => logLine.line) + .join('\n') + const resObj = { result: res.result._webout, - log: res.result.log + log: parsedSasjsServerLog } this.requestClient!.appendRequest(resObj, sasJob, config.debug) diff --git a/src/job-execution/WebJobExecutor.ts b/src/job-execution/WebJobExecutor.ts index 06fdfa2..57ff140 100644 --- a/src/job-execution/WebJobExecutor.ts +++ b/src/job-execution/WebJobExecutor.ts @@ -146,11 +146,16 @@ export class WebJobExecutor extends BaseJobExecutor { const requestPromise = new Promise((resolve, reject) => { this.requestClient!.post(apiUrl, formData, authConfig?.access_token) .then(async (res: any) => { + const parsedSasjsServerLog = + this.serverType === ServerType.Sasjs + ? res.result.log.map((logLine: any) => logLine.line).join('\n') + : res.result.log + const resObj = this.serverType === ServerType.Sasjs ? { result: res.result._webout, - log: res.result.log + log: parsedSasjsServerLog } : res this.requestClient!.appendRequest(resObj, sasJob, config.debug)