Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions packages/logger/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,7 @@ debug.formatters.a = (v?: Multiaddr): string => {
return v == null ? 'undefined' : v.toString()
}

// Add a formatter for stringifying Errors
debug.formatters.e = (v?: Error): string => {
if (v == null) {
return 'undefined'
}

function formatError (v: Error): string {
const message = notEmpty(v.message)
const stack = notEmpty(v.stack)

Expand All @@ -108,6 +103,35 @@ debug.formatters.e = (v?: Error): string => {
return v.toString()
}

function isAggregateError (err?: any): err is AggregateError {
return err?.name === 'AggregateError'
}

// Add a formatter for stringifying Errors
debug.formatters.e = (v?: Error): string => {
if (v == null) {
return 'undefined'
}

if (isAggregateError(v)) {
const indent = ' '

let output = formatError(v)

if (v.errors.length > 0) {
output += `\n${indent}${
v.errors.map(err => ` ${formatError(err).split('\n').join(`\n${indent}`)}`).join(`\n${indent}`)
}`
} else {
output += `\n${indent}[Error list was empty]`
}

return output.trim()
}

return formatError(v)
}

export type { Logger, ComponentLogger }

function createDisabledLogger (namespace: string): debug.Debugger {
Expand Down