mirror of
https://github.com/sasjs/server.git
synced 2025-12-10 19:34:34 +00:00
chore: use process.logger instead of condole.log
This commit is contained in:
@@ -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 }))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 }
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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}`
|
||||
)
|
||||
|
||||
@@ -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}`
|
||||
)
|
||||
})
|
||||
|
||||
@@ -36,7 +36,7 @@ export const loadAppStreamConfig = async () => {
|
||||
)
|
||||
}
|
||||
|
||||
console.log('App Stream Config loaded!')
|
||||
process.logger.info('App Stream Config loaded!')
|
||||
}
|
||||
|
||||
export const addEntryToAppStreamConfig = (
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ export const seedDB = async (): Promise<ConfigurationType> => {
|
||||
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<ConfigurationType> => {
|
||||
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<ConfigurationType> => {
|
||||
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<ConfigurationType> => {
|
||||
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<ConfigurationType> => {
|
||||
const configuration = new Configuration(SECRETS)
|
||||
configExist = await configuration.save()
|
||||
|
||||
console.log('DB Seed - configuration added')
|
||||
process.logger.success('DB Seed - configuration added')
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user