Skip to content

Commit

Permalink
(patch) Added padding to log-level, fixes #10
Browse files Browse the repository at this point in the history
  • Loading branch information
Sherex committed Aug 7, 2020
1 parent 5d42faf commit 74e65ec
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
12 changes: 10 additions & 2 deletions src/lib/log-level-mapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,18 @@ const levelMapper = {
silly: 5
}

const longestLevelString = Object.keys(levelMapper).reduce((prev, curr) => curr.length > prev.length ? curr : prev)

module.exports = (level) => {
try {
level = level.toLowerCase()
return levelMapper[level]
const severity = levelMapper[level.toLowerCase()]
if (typeof severity === 'number') {
return {
severity,
level: level.toUpperCase(),
padding: ' '.repeat(longestLevelString.length - level.length)
}
}
} catch (error) {
return undefined
}
Expand Down
12 changes: 6 additions & 6 deletions src/lib/logger-factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ function _loggerFactory (level, message,
}) {
const { fDate, fTime } = formatDateTime(new Date())
let messageArray = Array.isArray(message) ? message : [message]
let syslogSeverity = logLevelMapper(level)
let logLevel = logLevelMapper(level)

if (syslogSeverity === undefined) {
if (logLevel === undefined) {
if (!inProduction) throw Error(`Unknown log level '${level}'`)
level = 'warn'
syslogSeverity = logLevelMapper(level)
logLevel = logLevelMapper(level)
}

if (typeof loggerOptions.prefix === 'string') {
Expand All @@ -27,11 +27,11 @@ function _loggerFactory (level, message,
const funcDetails = pkg && pkg.version ? `${pkg.name} - ${pkg.version}: ` : ''
messageArray = messageArray.map(msg => typeof msg === 'object' ? JSON.stringify(msg) : msg)
const logMessage = `${funcDetails}${messageArray.join(' - ')}`
const remoteLogMessage = `${level.toUpperCase()} - ${logMessage}`
const localLogMessage = `[ ${fDate} ${fTime} ] < ${level.toUpperCase()} > ${logMessage}`
const remoteLogMessage = `${logLevel.level} - ${logMessage}`
const localLogMessage = `[ ${fDate} ${fTime} ] < ${logLevel.level} >${logLevel.padding} ${logMessage}`

const shouldLogToRemote = (loggerOptions.logToRemote && !(!inProduction && loggerOptions.onlyInProd)) || false
if (shouldLogToRemote) loggerOptions.remoteLogger.log(remoteLogMessage, { severity: syslogSeverity })
if (shouldLogToRemote) loggerOptions.remoteLogger.log(remoteLogMessage, { severity: logLevel.severity })

loggerOptions.localLogger(localLogMessage)

Expand Down

0 comments on commit 74e65ec

Please sign in to comment.