diff --git a/api/src/app-modules/configureCors.ts b/api/src/app-modules/configureCors.ts index 631b166..fc8a3ab 100644 --- a/api/src/app-modules/configureCors.ts +++ b/api/src/app-modules/configureCors.ts @@ -15,7 +15,7 @@ export const configureCors = (app: Express) => { whiteList.push(url.replace(/\/$/, '')) }) - console.log('All CORS Requests are enabled for:', whiteList) + process.logger.info('All CORS Requests are enabled for:', whiteList) app.use(cors({ credentials: true, origin: whiteList })) } } diff --git a/api/src/app-modules/configureLogger.ts b/api/src/app-modules/configureLogger.ts index 6edb3ba..a53f5f3 100644 --- a/api/src/app-modules/configureLogger.ts +++ b/api/src/app-modules/configureLogger.ts @@ -23,7 +23,7 @@ export const configureLogger = (app: Express) => { path: logsFolder }) - console.log('Writing Logs to :', path.join(logsFolder, filename)) + process.logger.info('Writing Logs to :', path.join(logsFolder, filename)) options = { stream: accessLogStream } } diff --git a/api/src/app.ts b/api/src/app.ts index 2c24ac4..f40da18 100644 --- a/api/src/app.ts +++ b/api/src/app.ts @@ -35,7 +35,7 @@ if (verifyEnvVariables()) process.exit(ReturnCode.InvalidEnv) const app = express() const onError: ErrorRequestHandler = (err, req, res, next) => { - console.error(err.stack) + process.logger.error(err.stack) res.status(500).send('Something broke!') } @@ -76,7 +76,7 @@ export default setProcessVariables().then(async () => { const sasautosPath = path.join(process.driveLoc, 'sas', 'sasautos') if (await folderExists(sasautosPath)) { - console.log( + process.logger.warn( `SASAUTOS was not refreshed. To force a refresh, delete the ${sasautosPath} folder` ) } else { diff --git a/api/src/controllers/internal/Session.ts b/api/src/controllers/internal/Session.ts index edcc6f5..493952e 100644 --- a/api/src/controllers/internal/Session.ts +++ b/api/src/controllers/internal/Session.ts @@ -145,12 +145,12 @@ ${autoExecContent}` ]) .then(() => { session.completed = true - console.log('session completed', session) + process.logger.info('session completed', session) }) .catch((err) => { session.completed = true session.crashed = err.toString() - console.log('session crashed', session.id, session.crashed) + process.logger.error('session crashed', session.id, session.crashed) }) // we have a triggered session - add to array @@ -170,7 +170,10 @@ ${autoExecContent}` while ((await fileExists(codeFilePath)) && !session.crashed) {} if (session.crashed) - console.log('session crashed! while waiting to be ready', session.crashed) + process.logger.error( + 'session crashed! while waiting to be ready', + session.crashed + ) session.ready = true } diff --git a/api/src/controllers/internal/processProgram.ts b/api/src/controllers/internal/processProgram.ts index ff52c9d..dc7ff45 100644 --- a/api/src/controllers/internal/processProgram.ts +++ b/api/src/controllers/internal/processProgram.ts @@ -118,11 +118,11 @@ export const processProgram = async ( // copy the code file to log and end write stream writeStream.end(program) session.completed = true - console.log('session completed', session) + process.logger.info('session completed', session) } catch (err: any) { session.completed = true session.crashed = err.toString() - console.log('session crashed', session.id, session.crashed) + process.logger.error('session crashed', session.id, session.crashed) } } } diff --git a/api/src/controllers/mock-sas9.ts b/api/src/controllers/mock-sas9.ts index d4f7282..01a424f 100644 --- a/api/src/controllers/mock-sas9.ts +++ b/api/src/controllers/mock-sas9.ts @@ -107,7 +107,7 @@ export class MockSas9Controller { content: result.result as string } } catch (err) { - console.log('err', err) + process.logger.error('err', err) } return { @@ -168,7 +168,7 @@ export class MockSas9Controller { content: result.result as string } } catch (err) { - console.log('err', err) + process.logger.error('err', err) } return { @@ -269,7 +269,7 @@ const getMockResponseFromFile = async ( let file = await readFile(filePathParsed).catch((err: any) => { const errMsg = `Error reading mocked file on path: ${filePathParsed}\nError: ${err}` - console.error(errMsg) + process.logger.error(errMsg) error = true diff --git a/api/src/routes/appStream/index.ts b/api/src/routes/appStream/index.ts index 1c397d5..5227b10 100644 --- a/api/src/routes/appStream/index.ts +++ b/api/src/routes/appStream/index.ts @@ -58,7 +58,7 @@ export const publishAppStream = async ( ) const sasJsPort = process.env.PORT || 5000 - console.log( + process.logger.info( 'Serving Stream App: ', `http://localhost:${sasJsPort}/AppStream/${streamServiceName}` ) diff --git a/api/src/server.ts b/api/src/server.ts index 0743469..e859b87 100644 --- a/api/src/server.ts +++ b/api/src/server.ts @@ -7,11 +7,11 @@ appPromise.then(async (app) => { const protocol = process.env.PROTOCOL || 'http' const sasJsPort = process.env.PORT || 5000 - console.log('PROTOCOL: ', protocol) + process.logger.info('PROTOCOL: ', protocol) if (protocol !== 'https') { app.listen(sasJsPort, () => { - console.log( + process.logger.info( `⚡️[server]: Server is running at http://localhost:${sasJsPort}` ) }) @@ -20,7 +20,7 @@ appPromise.then(async (app) => { const httpsServer = createServer({ key, cert, ca }, app) httpsServer.listen(sasJsPort, () => { - console.log( + process.logger.info( `⚡️[server]: Server is running at https://localhost:${sasJsPort}` ) }) diff --git a/api/src/utils/appStreamConfig.ts b/api/src/utils/appStreamConfig.ts index f4f137d..672c679 100644 --- a/api/src/utils/appStreamConfig.ts +++ b/api/src/utils/appStreamConfig.ts @@ -36,7 +36,7 @@ export const loadAppStreamConfig = async () => { ) } - console.log('App Stream Config loaded!') + process.logger.info('App Stream Config loaded!') } export const addEntryToAppStreamConfig = ( diff --git a/api/src/utils/connectDB.ts b/api/src/utils/connectDB.ts index 9d47607..8849cd5 100644 --- a/api/src/utils/connectDB.ts +++ b/api/src/utils/connectDB.ts @@ -8,6 +8,6 @@ export const connectDB = async () => { throw new Error('Unable to connect to DB!') } - console.log('Connected to DB!') + process.logger.success('Connected to DB!') return seedDB() } diff --git a/api/src/utils/copySASjsCore.ts b/api/src/utils/copySASjsCore.ts index d45a72e..6f0e499 100644 --- a/api/src/utils/copySASjsCore.ts +++ b/api/src/utils/copySASjsCore.ts @@ -12,7 +12,7 @@ import { getMacrosFolder, sasJSCoreMacros, sasJSCoreMacrosInfo } from '.' export const copySASjsCore = async () => { if (process.env.NODE_ENV === 'test') return - console.log('Copying Macros from container to drive.') + process.logger.log('Copying Macros from container to drive.') const macrosDrivePath = getMacrosFolder() @@ -30,5 +30,5 @@ export const copySASjsCore = async () => { await createFile(macroFileDestPath, macroContent) }) - console.log('Macros Drive Path:', macrosDrivePath) + process.logger.info('Macros Drive Path:', macrosDrivePath) } diff --git a/api/src/utils/createWeboutSasFile.ts b/api/src/utils/createWeboutSasFile.ts index 26f549f..ff29aa0 100644 --- a/api/src/utils/createWeboutSasFile.ts +++ b/api/src/utils/createWeboutSasFile.ts @@ -12,7 +12,7 @@ const fileContent = `%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta export const createWeboutSasFile = async () => { const macrosDrivePath = getMacrosFolder() - console.log(`Creating webout.sas at ${macrosDrivePath}`) + process.logger.log(`Creating webout.sas at ${macrosDrivePath}`) const filePath = path.join(macrosDrivePath, 'webout.sas') await createFile(filePath, fileContent) } diff --git a/api/src/utils/getCertificates.ts b/api/src/utils/getCertificates.ts index 6c295e0..ae6027c 100644 --- a/api/src/utils/getCertificates.ts +++ b/api/src/utils/getCertificates.ts @@ -10,9 +10,9 @@ export const getCertificates = async () => { const certPath = CERT_CHAIN ?? (await getFileInput('Certificate Chain (PEM)')) const caPath = CA_ROOT - console.log('keyPath: ', keyPath) - console.log('certPath: ', certPath) - if (caPath) console.log('caPath: ', caPath) + process.logger.info('keyPath: ', keyPath) + process.logger.info('certPath: ', certPath) + if (caPath) process.logger.info('caPath: ', caPath) const key = await readFile(keyPath) const cert = await readFile(certPath) diff --git a/api/src/utils/parseHelmetConfig.ts b/api/src/utils/parseHelmetConfig.ts index 4f52b37..de48589 100644 --- a/api/src/utils/parseHelmetConfig.ts +++ b/api/src/utils/parseHelmetConfig.ts @@ -22,12 +22,12 @@ export const getEnvCSPDirectives = ( try { cspConfigJson = JSON.parse(file) } catch (e) { - console.error( + process.logger.error( 'Parsing Content Security Policy JSON config failed. Make sure it is valid json' ) } } catch (e) { - console.error('Error reading HELMET CSP config file', e) + process.logger.error('Error reading HELMET CSP config file', e) } } diff --git a/api/src/utils/seedDB.ts b/api/src/utils/seedDB.ts index 5187900..1da77a6 100644 --- a/api/src/utils/seedDB.ts +++ b/api/src/utils/seedDB.ts @@ -19,7 +19,7 @@ export const seedDB = async (): Promise => { const client = new Client(CLIENT) await client.save() - console.log(`DB Seed - client created: ${CLIENT.clientId}`) + process.logger.success(`DB Seed - client created: ${CLIENT.clientId}`) } // Checking if 'AllUsers' Group is already in the database @@ -28,7 +28,7 @@ export const seedDB = async (): Promise => { const group = new Group(GROUP) groupExist = await group.save() - console.log(`DB Seed - Group created: ${GROUP.name}`) + process.logger.success(`DB Seed - Group created: ${GROUP.name}`) } // Checking if 'Public' Group is already in the database @@ -37,7 +37,7 @@ export const seedDB = async (): Promise => { const group = new Group(PUBLIC_GROUP) await group.save() - console.log(`DB Seed - Group created: ${PUBLIC_GROUP.name}`) + process.logger.success(`DB Seed - Group created: ${PUBLIC_GROUP.name}`) } // Checking if user is already in the database @@ -46,12 +46,14 @@ export const seedDB = async (): Promise => { const user = new User(ADMIN_USER) usernameExist = await user.save() - console.log(`DB Seed - admin account created: ${ADMIN_USER.username}`) + process.logger.success( + `DB Seed - admin account created: ${ADMIN_USER.username}` + ) } if (!groupExist.hasUser(usernameExist)) { groupExist.addUser(usernameExist) - console.log( + process.logger.success( `DB Seed - admin account '${ADMIN_USER.username}' added to Group '${GROUP.name}'` ) } @@ -62,7 +64,7 @@ export const seedDB = async (): Promise => { const configuration = new Configuration(SECRETS) configExist = await configuration.save() - console.log('DB Seed - configuration added') + process.logger.success('DB Seed - configuration added') } return { diff --git a/api/src/utils/setProcessVariables.ts b/api/src/utils/setProcessVariables.ts index e573998..c1a6cd4 100644 --- a/api/src/utils/setProcessVariables.ts +++ b/api/src/utils/setProcessVariables.ts @@ -62,8 +62,8 @@ export const setProcessVariables = async () => { process.logsUUID = 'SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784' - console.log('sasLoc: ', process.sasLoc) - console.log('sasDrive: ', process.driveLoc) - console.log('sasLogs: ', process.logsLoc) - console.log('runTimes: ', process.runTimes) + process.logger.info('sasLoc: ', process.sasLoc) + process.logger.info('sasDrive: ', process.driveLoc) + process.logger.info('sasLogs: ', process.logsLoc) + process.logger.info('runTimes: ', process.runTimes) }