diff --git a/src/handler.ts b/src/handler.ts index c75db06..24ff076 100644 --- a/src/handler.ts +++ b/src/handler.ts @@ -78,7 +78,7 @@ export class Handler extends Filterer { } get level(): number { return this._level } - set level(level: LogLevel|string) { this.level = checkLevel(level) } + set level(level: LogLevel|string) { this._level = checkLevel(level) } get scope(): string|null { return this._scope } set scope(scope: string) { this._scope = scope } @@ -90,11 +90,9 @@ export class Handler extends Filterer { * If a formatter is set, use it. Otherwise, use the default formatter for * the module. */ - format(record: LogRecord) { - var fmt: Formatter|null = null; - - if (this.formatter) { fmt = this.formatter } - else { fmt = DEFAULT_FORMATTER } + format(record: LogRecord): string { + const fmt = this.formatter ?? DEFAULT_FORMATTER; + return fmt.format(record); } /** @@ -159,6 +157,7 @@ export class Handler extends Filterer { ) } + get formatter(): Formatter|null { return this._formatter } set formatter(fmt: Formatter) { this._formatter = fmt } }