From 3ff6f5e86581cd2ac23bbe0b8e2c367fbea890ed Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Sat, 2 Apr 2022 07:06:09 +0500 Subject: [PATCH] fix(stp): return log+webout for debug on --- api/src/controllers/internal/Execution.ts | 9 ++++----- api/src/routes/appStream/index.ts | 2 +- api/src/server.ts | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/api/src/controllers/internal/Execution.ts b/api/src/controllers/internal/Execution.ts index a78ef47..755bd00 100644 --- a/api/src/controllers/internal/Execution.ts +++ b/api/src/controllers/internal/Execution.ts @@ -178,11 +178,10 @@ ${program}` return { httpHeaders, - result: fileResponse - ? webout - : isDebugOn(vars) || session.crashed - ? `${webout}

SAS Log

${log}
` - : webout + result: + isDebugOn(vars) || session.crashed + ? `${webout}

SAS Log

${log}
` + : webout } } diff --git a/api/src/routes/appStream/index.ts b/api/src/routes/appStream/index.ts index ea379e7..5d3205d 100644 --- a/api/src/routes/appStream/index.ts +++ b/api/src/routes/appStream/index.ts @@ -52,7 +52,7 @@ export const publishAppStream = async ( addEntryToFile ) - const sasJsPort = process.env.PORT ?? 5000 + const sasJsPort = process.env.PORT || 5000 console.log( 'Serving Stream App: ', `http://localhost:${sasJsPort}/AppStream/${streamServiceName}` diff --git a/api/src/server.ts b/api/src/server.ts index 6cf0e42..3745169 100644 --- a/api/src/server.ts +++ b/api/src/server.ts @@ -4,8 +4,8 @@ import appPromise from './app' import { getCertificates } from './utils' appPromise.then(async (app) => { - const protocol = process.env.PROTOCOL ?? 'http' - const sasJsPort = process.env.PORT ?? 5000 + const protocol = process.env.PROTOCOL || 'http' + const sasJsPort = process.env.PORT || 5000 console.log('PROTOCOL: ', protocol)