Skip to content

Commit 7c73879

Browse files
committed
migrate to pino
1 parent b62b7f1 commit 7c73879

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ project
2020
try {
2121
await runAddProjectCommand(knex, options)
2222
} catch (error) {
23-
logger.error('Error adding project:', error.message)
23+
logger.error(error)
2424
process.exit(1)
2525
} finally {
2626
await knex.destroy()
@@ -38,7 +38,7 @@ workflow
3838
try {
3939
await runWorkflowCommand(knex, options)
4040
} catch (error) {
41-
logger.error('Error running workflow:', error.message)
41+
logger.error(error)
4242
process.exit(1)
4343
} finally {
4444
await knex.destroy()
@@ -62,7 +62,7 @@ check
6262
try {
6363
await listCheckCommand(knex, options)
6464
} catch (error) {
65-
logger.error('Error running check:', error.message)
65+
logger.error(error)
6666
process.exit(1)
6767
} finally {
6868
await knex.destroy()
@@ -77,7 +77,7 @@ check
7777
try {
7878
await runCheckCommand(knex, options)
7979
} catch (error) {
80-
logger.error('Error running check:', error.message)
80+
logger.error(error)
8181
process.exit(1)
8282
} finally {
8383
await knex.destroy()

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
"knex": "3.1.0",
4040
"octokit": "3.2.1",
4141
"pg": "8.13.1",
42+
"pino": "^9.5.0",
43+
"pino-pretty": "^13.0.0",
4244
"validator": "13.12.0"
4345
},
4446
"devDependencies": {

src/cli/workflows.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ const commandList = [{
2424
const validCommandNames = commandList.map(({ name }) => name)
2525

2626
function listWorkflowCommand (options = {}) {
27-
logger.log('Available workflows:')
28-
logger.log(commandList.map(({ name, description }) => `- ${name}: ${description}`).join('\n'))
27+
logger.log('Available workflows: \n')
28+
commandList.forEach(({ name, description }) => logger.log(`- ${name}: ${description}`))
2929
return commandList
3030
}
3131

src/providers/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const performScorecardAnalysis = async (repo) => {
6565
const start = new Date().getTime()
6666
const { stdout, stderr } = await exec(`docker run -e GITHUB_AUTH_TOKEN=${process.env.GITHUB_TOKEN} --rm ${ossfScorecardSettings.dockerImage} --repo=${repo.html_url} --show-details --format=json`)
6767
if (stderr) {
68-
console.error(stderr)
68+
logger.error(stderr)
6969
throw new Error(`Error running OSSF Scorecard for repository (${repo.full_name})`)
7070
}
7171
const data = JSON.parse(stdout)

src/utils/index.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
const { add, parseISO, isBefore } = require('date-fns')
22
const isURL = require('validator/lib/isURL.js')
3+
const pino = require('pino')({
4+
transport: {
5+
target: 'pino-pretty'
6+
},
7+
level: process.env.PINO_LOG_LEVEL || 'trace'
8+
})
39

410
const validateGithubUrl = (url) => isURL(url, { protocols: ['https'], require_protocol: true }) && url.includes('github.com')
511

@@ -13,14 +19,15 @@ const defineLog = (type) => function () {
1319
if (process.env.NODE_ENV === 'test') {
1420
return () => {}
1521
}
16-
return console[type](...arguments)
22+
23+
return pino[type](...arguments)
1724
}
1825

1926
const logger = {
2027
info: defineLog('info'),
2128
error: defineLog('error'),
2229
warn: defineLog('warn'),
23-
log: defineLog('log')
30+
log: defineLog('trace')
2431
}
2532

2633
const getSeverityFromPriorityGroup = (priorityGroup) => {

0 commit comments

Comments
 (0)