Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Commit

Permalink
♻️ Refactor formatters conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
Michal Vlasák committed Jun 15, 2020
1 parent cae1000 commit 6dce7fa
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const objEmpty = (obj: object) => Object.keys(obj).length === 0;

// This is a custom slightly edited version of pino-multistream's write method, which adds support for maximum log level
// The original version was pino-multistream 4.2.0 (commit bf7941f) - https://github.com/pinojs/pino-multi-stream/blob/bf7941f77661b6c14dd40840ff4a4db6897f08eb/multistream.js#L43
const maxLevelWrite: pino.WriteFn = function(this: any, data: object): void {
const maxLevelWrite: pino.WriteFn = function (this: any, data: object): void {
let stream;
const metadata = Symbol.for('pino.metadata');
const level = this.lastLevel;
Expand Down Expand Up @@ -89,12 +89,12 @@ const initFormatters = (options: CosmasOptions & { loggerName?: string }) => {

// do not put logger name field to pretty outputs
formatters.log = (object: { [key: string]: any }) => {
if (options.loggerName && !options.pretty) {
object[loggerNameKey] = options.loggerName;
}
if (options.pretty) return object;

// put pkgVersion to non-pretty outputs
if (!options.pretty) {
object[pkgVersionKey] = pkgJson.version;
object[pkgVersionKey] = pkgJson.version;
if (options.loggerName) {
object[loggerNameKey] = options.loggerName;
}
return object;
};
Expand All @@ -106,7 +106,7 @@ const initHooks = (options: CosmasOptions & { loggerName?: string }) => {
if (!options.loggerName) return hooks;

// always put logger name to message
hooks.logMethod = function(inputArgs, method) {
hooks.logMethod = function (inputArgs, method) {
const text = inputArgs[inputArgs.length - 1];
if (typeof text === 'string' || text instanceof String) {
inputArgs[inputArgs.length - 1] = `[${options.loggerName}] ${text}`;
Expand Down

0 comments on commit 6dce7fa

Please sign in to comment.