@verdaccio/logger 6.0.0-6-next.5 → 6.0.0-6-next.9

package/CHANGELOG.md

@@ -1,5 +1,54 @@
 # @verdaccio/logger
 
+## 6.0.0-6-next.9
+
+### Major Changes
+
+- 730b5d8c: feat: upgrade to pino v7
+
+### Patch Changes
+
+- Updated dependencies [730b5d8c]
+  - @verdaccio/logger-prettify@6.0.0-6-next.6
+
+## 6.0.0-6-next.8
+
+### Patch Changes
+
+- e75c0a3b: hydrate template placeholders in log messages when format is set to 'json'
+- Updated dependencies [24b9be02]
+- Updated dependencies [e75c0a3b]
+  - @verdaccio/core@6.0.0-6-next.4
+  - @verdaccio/logger-prettify@6.0.0-6-next.5
+
+## 6.0.0-6-next.7
+
+### Minor Changes
+
+- 6c1eb021: feat: use warning codes for deprecation warnings
+
+### Patch Changes
+
+- Updated dependencies [6c1eb021]
+  - @verdaccio/core@6.0.0-6-next.3
+
+## 6.0.0-6-next.6
+
+### Major Changes
+
+- 794af76c: Remove Node 12 support
+
+  - We need move to the new `undici` and does not support Node.js 12
+
+### Minor Changes
+
+- 154b2ecd: refactor: remove @verdaccio/commons-api in favor @verdaccio/core and remove duplications
+
+### Patch Changes
+
+- Updated dependencies [b702ea36]
+  - @verdaccio/logger-prettify@6.0.0-6-next.4
+
 ## 6.0.0-6-next.5
 
 ### Patch Changes

package/build/index.js

@@ -3,12 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "setup", {
-  enumerable: true,
-  get: function () {
-    return _logger.setup;
-  }
-});
 Object.defineProperty(exports, "createLogger", {
   enumerable: true,
   get: function () {
@@ -21,6 +15,12 @@ Object.defineProperty(exports, "logger", {
     return _logger.logger;
   }
 });
+Object.defineProperty(exports, "setup", {
+  enumerable: true,
+  get: function () {
+    return _logger.setup;
+  }
+});
 
 var _logger = require("./logger");
 //# sourceMappingURL=index.js.map

package/build/logger.js

@@ -5,22 +5,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createLogger = createLogger;
 exports.getLogger = getLogger;
-exports.setup = setup;
 exports.logger = void 0;
+exports.setup = setup;
 
-var _pino = _interopRequireDefault(require("pino"));
+var _debug = _interopRequireDefault(require("debug"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _debug = _interopRequireDefault(require("debug"));
+var _pino = _interopRequireDefault(require("pino"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _core = require("@verdaccio/core");
+
+var _loggerPrettify = _interopRequireWildcard(require("@verdaccio/logger-prettify"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const debug = (0, _debug.default)('verdaccio:logger');
 let logger;
@@ -43,30 +45,45 @@ function createLogger(options = {
     format = DEFAULT_LOG_FORMAT;
   }
 
-  let pinoConfig = _objectSpread(_objectSpread({
+  let pinoConfig = {
     customLevels: {
       http: 25
-    }
-  }, options), {}, {
+    },
+    ...options,
     level: options.level,
     serializers: {
       err: _pino.default.stdSerializers.err,
       req: _pino.default.stdSerializers.req,
       res: _pino.default.stdSerializers.res
     }
-  });
-
+  };
   debug('has prettifier? %o', !isProd()); // pretty logs are not allowed in production for performance reasons
 
   if ((format === DEFAULT_LOG_FORMAT || format !== 'json') && isProd() === false) {
     pinoConfig = Object.assign({}, pinoConfig, {
+      prettifier: _loggerPrettify.default,
       // more info
       // https://github.com/pinojs/pino-pretty/issues/37
-      prettyPrint: _objectSpread({
+      prettyPrint: {
         levelFirst: true,
-        prettyStamp: format === 'pretty-timestamped'
-      }, prettyPrintOptions),
-      prettifier: require('@verdaccio/logger-prettify')
+        prettyStamp: format === 'pretty-timestamped',
+        ...prettyPrintOptions
+      }
+    });
+  } else {
+    pinoConfig = Object.assign({}, pinoConfig, {
+      // more info
+      // https://github.com/pinojs/pino/blob/v7.1.0/docs/api.md#hooks-object
+      hooks: {
+        logMethod(inputArgs, method) {
+          const [templateObject, message, ...otherArgs] = inputArgs;
+          const templateVars = !!templateObject && typeof templateObject === 'object' ? Object.getOwnPropertyNames(templateObject) : [];
+          if (!message || !templateVars.length) return method.apply(this, inputArgs);
+          const hydratedMessage = (0, _loggerPrettify.fillInMsgTemplate)(message, templateObject, false);
+          return method.apply(this, [templateObject, hydratedMessage, ...otherArgs]);
+        }
+
+      }
     });
   }
 
@@ -84,7 +101,8 @@ function createLogger(options = {
 function getLogger() {
   if (_lodash.default.isNil(logger)) {
     // FIXME: not sure about display here a warning
-    process.emitWarning('logger is not defined');
+    _core.warningUtils.emit(_core.warningUtils.Codes.VERWAR002);
+
     return;
   }
 
@@ -104,8 +122,7 @@ function setup(options = DEFAULT_LOGGER_CONF) {
   const isLegacyConf = Array.isArray(options);
 
   if (isLegacyConf) {
-    const deprecateMessage = 'deprecate: multiple logger configuration is deprecated, please check the migration guide.';
-    process.emitWarning(deprecateMessage);
+    _core.warningUtils.emit(_core.warningUtils.Codes.VERDEP002);
   } // verdaccio 5 does not allow multiple logger configuration
   // backward compatible, pick only the first option
   // next major will thrown an error
@@ -127,7 +144,8 @@ function setup(options = DEFAULT_LOGGER_CONF) {
     debug('logging file enabled');
     exports.logger = logger = createLogger(pinoConfig, _pino.default.destination(loggerConfig.path), loggerConfig.format);
   } else if (loggerConfig.type === 'rotating-file') {
-    process.emitWarning('rotating-file type is not longer supported, consider use [logrotate] instead');
+    _core.warningUtils.emit(_core.warningUtils.Codes.VERWAR003);
+
     debug('logging stdout enabled');
     exports.logger = logger = createLogger(pinoConfig, _pino.default.destination(1), loggerConfig.format);
   } else {

package/build/logger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/logger.ts"],"names":["debug","logger","isProd","process","env","NODE_ENV","DEFAULT_LOG_FORMAT","createLogger","options","level","destination","pino","format","prettyPrintOptions","suppressFlushSyncWarning","_","isNil","pinoConfig","customLevels","http","serializers","err","stdSerializers","req","res","Object","assign","prettyPrint","levelFirst","prettyStamp","prettifier","require","DEBUG","on","lvl","val","prevLvl","prevVal","getLogger","emitWarning","DEFAULT_LOGGER_CONF","type","setup","isLegacyConf","Array","isArray","deprecateMessage","loggerConfig","path","finalHandler","final","finalLogger","event","info","error","exit"],"mappings":"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","sourcesContent":["import pino from 'pino';\nimport _ from 'lodash';\nimport buildDebug from 'debug';\n\nconst debug = buildDebug('verdaccio:logger');\n\nexport let logger;\n\nfunction isProd() {\n  return process.env.NODE_ENV === 'production';\n}\n\nconst DEFAULT_LOG_FORMAT = isProd() ? 'json' : 'pretty';\n\nexport type LogPlugin = {\n  dest: string;\n  options?: any[];\n};\n\nexport type LogType = 'file' | 'stdout';\nexport type LogFormat = 'json' | 'pretty-timestamped' | 'pretty';\n\nexport function createLogger(\n  options = { level: 'http' },\n  destination = pino.destination(1),\n  format: LogFormat = DEFAULT_LOG_FORMAT,\n  prettyPrintOptions = {\n    // we hide warning since the prettifier should not be used in production\n    // https://getpino.io/#/docs/pretty?id=prettifier-api\n    suppressFlushSyncWarning: true,\n  }\n) {\n  if (_.isNil(format)) {\n    format = DEFAULT_LOG_FORMAT;\n  }\n\n  let pinoConfig = {\n    customLevels: {\n      http: 25,\n    },\n    ...options,\n    level: options.level,\n    serializers: {\n      err: pino.stdSerializers.err,\n      req: pino.stdSerializers.req,\n      res: pino.stdSerializers.res,\n    },\n  };\n\n  debug('has prettifier? %o', !isProd());\n  // pretty logs are not allowed in production for performance reasons\n  if ((format === DEFAULT_LOG_FORMAT || format !== 'json') && isProd() === false) {\n    pinoConfig = Object.assign({}, pinoConfig, {\n      // more info\n      // https://github.com/pinojs/pino-pretty/issues/37\n      prettyPrint: {\n        levelFirst: true,\n        prettyStamp: format === 'pretty-timestamped',\n        ...prettyPrintOptions,\n      },\n      prettifier: require('@verdaccio/logger-prettify'),\n    });\n  }\n  const logger = pino(pinoConfig, destination);\n\n  if (process.env.DEBUG) {\n    logger.on('level-change', (lvl, val, prevLvl, prevVal) => {\n      debug('%s (%d) was changed to %s (%d)', lvl, val, prevLvl, prevVal);\n    });\n  }\n\n  return logger;\n}\n\nexport function getLogger() {\n  if (_.isNil(logger)) {\n    // FIXME: not sure about display here a warning\n    process.emitWarning('logger is not defined');\n    return;\n  }\n\n  return logger;\n}\n\nconst DEFAULT_LOGGER_CONF: LoggerConfigItem = {\n  type: 'stdout',\n  format: 'pretty',\n  level: 'http',\n};\n\nexport type LoggerConfigItem = {\n  type?: LogType;\n  plugin?: LogPlugin;\n  format?: LogFormat;\n  path?: string;\n  level?: string;\n};\n\nexport type LoggerConfig = LoggerConfigItem[];\n\nexport function setup(options: LoggerConfig | LoggerConfigItem = DEFAULT_LOGGER_CONF) {\n  debug('setup logger');\n  const isLegacyConf = Array.isArray(options);\n  if (isLegacyConf) {\n    const deprecateMessage =\n      'deprecate: multiple logger configuration is deprecated, please check the migration guide.';\n    process.emitWarning(deprecateMessage);\n  }\n\n  // verdaccio 5 does not allow multiple logger configuration\n  // backward compatible, pick only the first option\n  // next major will thrown an error\n  let loggerConfig = isLegacyConf ? options[0] : options;\n  if (!loggerConfig?.level) {\n    loggerConfig = Object.assign(\n      {},\n      {\n        level: 'http',\n      },\n      loggerConfig\n    );\n  }\n  const pinoConfig = { level: loggerConfig.level };\n  if (loggerConfig.type === 'file') {\n    debug('logging file enabled');\n    logger = createLogger(pinoConfig, pino.destination(loggerConfig.path), loggerConfig.format);\n  } else if (loggerConfig.type === 'rotating-file') {\n    process.emitWarning(\n      'rotating-file type is not longer supported, consider use [logrotate] instead'\n    );\n    debug('logging stdout enabled');\n    logger = createLogger(pinoConfig, pino.destination(1), loggerConfig.format);\n  } else {\n    debug('logging stdout enabled');\n    logger = createLogger(pinoConfig, pino.destination(1), loggerConfig.format);\n  }\n\n  if (isProd()) {\n    // why only on prod? https://github.com/pinojs/pino/issues/920#issuecomment-710807667\n    const finalHandler = pino.final(logger, (err, finalLogger, event) => {\n      finalLogger.info(`${event} caught`);\n      if (err) {\n        finalLogger.error(err, 'error caused exit');\n      }\n      process.exit(err ? 1 : 0);\n    });\n\n    process.on('uncaughtException', (err) => finalHandler(err, 'uncaughtException'));\n    process.on('unhandledRejection', (err) => finalHandler(err as Error, 'unhandledRejection'));\n    process.on('beforeExit', () => finalHandler(null, 'beforeExit'));\n    process.on('exit', () => finalHandler(null, 'exit'));\n    process.on('uncaughtException', (err) => finalHandler(err, 'uncaughtException'));\n    process.on('SIGINT', () => finalHandler(null, 'SIGINT'));\n    process.on('SIGQUIT', () => finalHandler(null, 'SIGQUIT'));\n    process.on('SIGTERM', () => finalHandler(null, 'SIGTERM'));\n  }\n\n  return logger;\n}\n"],"file":"logger.js"}
+{"version":3,"sources":["../src/logger.ts"],"names":["debug","logger","isProd","process","env","NODE_ENV","DEFAULT_LOG_FORMAT","createLogger","options","level","destination","pino","format","prettyPrintOptions","suppressFlushSyncWarning","_","isNil","pinoConfig","customLevels","http","serializers","err","stdSerializers","req","res","Object","assign","prettifier","prettyPrint","levelFirst","prettyStamp","hooks","logMethod","inputArgs","method","templateObject","message","otherArgs","templateVars","getOwnPropertyNames","length","apply","hydratedMessage","DEBUG","on","lvl","val","prevLvl","prevVal","getLogger","warningUtils","emit","Codes","VERWAR002","DEFAULT_LOGGER_CONF","type","setup","isLegacyConf","Array","isArray","VERDEP002","loggerConfig","path","VERWAR003","finalHandler","final","finalLogger","event","info","error","exit"],"mappings":"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","sourcesContent":["import buildDebug from 'debug';\nimport _ from 'lodash';\nimport pino from 'pino';\n\nimport { warningUtils } from '@verdaccio/core';\nimport prettifier, { fillInMsgTemplate } from '@verdaccio/logger-prettify';\n\nconst debug = buildDebug('verdaccio:logger');\n\nexport let logger;\n\nfunction isProd() {\n  return process.env.NODE_ENV === 'production';\n}\n\nconst DEFAULT_LOG_FORMAT = isProd() ? 'json' : 'pretty';\n\nexport type LogPlugin = {\n  dest: string;\n  options?: any[];\n};\n\nexport type LogType = 'file' | 'stdout';\nexport type LogFormat = 'json' | 'pretty-timestamped' | 'pretty';\n\nexport function createLogger(\n  options = { level: 'http' },\n  destination = pino.destination(1),\n  format: LogFormat = DEFAULT_LOG_FORMAT,\n  prettyPrintOptions = {\n    // we hide warning since the prettifier should not be used in production\n    // https://getpino.io/#/docs/pretty?id=prettifier-api\n    suppressFlushSyncWarning: true,\n  }\n) {\n  if (_.isNil(format)) {\n    format = DEFAULT_LOG_FORMAT;\n  }\n\n  let pinoConfig = {\n    customLevels: {\n      http: 25,\n    },\n    ...options,\n    level: options.level,\n    serializers: {\n      err: pino.stdSerializers.err,\n      req: pino.stdSerializers.req,\n      res: pino.stdSerializers.res,\n    },\n  };\n\n  debug('has prettifier? %o', !isProd());\n  // pretty logs are not allowed in production for performance reasons\n  if ((format === DEFAULT_LOG_FORMAT || format !== 'json') && isProd() === false) {\n    pinoConfig = Object.assign({}, pinoConfig, {\n      prettifier,\n      // more info\n      // https://github.com/pinojs/pino-pretty/issues/37\n      prettyPrint: {\n        levelFirst: true,\n        prettyStamp: format === 'pretty-timestamped',\n        ...prettyPrintOptions,\n      },\n    });\n  } else {\n    pinoConfig = Object.assign({}, pinoConfig, {\n      // more info\n      // https://github.com/pinojs/pino/blob/v7.1.0/docs/api.md#hooks-object\n      hooks: {\n        logMethod(inputArgs, method) {\n          const [templateObject, message, ...otherArgs] = inputArgs;\n          const templateVars =\n            !!templateObject && typeof templateObject === 'object'\n              ? Object.getOwnPropertyNames(templateObject)\n              : [];\n          if (!message || !templateVars.length) return method.apply(this, inputArgs);\n          const hydratedMessage = fillInMsgTemplate(message, templateObject, false);\n          return method.apply(this, [templateObject, hydratedMessage, ...otherArgs]);\n        },\n      },\n    });\n  }\n  const logger = pino(pinoConfig, destination);\n\n  if (process.env.DEBUG) {\n    logger.on('level-change', (lvl, val, prevLvl, prevVal) => {\n      debug('%s (%d) was changed to %s (%d)', lvl, val, prevLvl, prevVal);\n    });\n  }\n\n  return logger;\n}\n\nexport function getLogger() {\n  if (_.isNil(logger)) {\n    // FIXME: not sure about display here a warning\n    warningUtils.emit(warningUtils.Codes.VERWAR002);\n    return;\n  }\n\n  return logger;\n}\n\nconst DEFAULT_LOGGER_CONF: LoggerConfigItem = {\n  type: 'stdout',\n  format: 'pretty',\n  level: 'http',\n};\n\nexport type LoggerConfigItem = {\n  type?: LogType;\n  plugin?: LogPlugin;\n  format?: LogFormat;\n  path?: string;\n  level?: string;\n};\n\nexport type LoggerConfig = LoggerConfigItem[];\n\nexport function setup(options: LoggerConfig | LoggerConfigItem = DEFAULT_LOGGER_CONF) {\n  debug('setup logger');\n  const isLegacyConf = Array.isArray(options);\n  if (isLegacyConf) {\n    warningUtils.emit(warningUtils.Codes.VERDEP002);\n  }\n\n  // verdaccio 5 does not allow multiple logger configuration\n  // backward compatible, pick only the first option\n  // next major will thrown an error\n  let loggerConfig = isLegacyConf ? options[0] : options;\n  if (!loggerConfig?.level) {\n    loggerConfig = Object.assign(\n      {},\n      {\n        level: 'http',\n      },\n      loggerConfig\n    );\n  }\n  const pinoConfig = { level: loggerConfig.level };\n  if (loggerConfig.type === 'file') {\n    debug('logging file enabled');\n    logger = createLogger(pinoConfig, pino.destination(loggerConfig.path), loggerConfig.format);\n  } else if (loggerConfig.type === 'rotating-file') {\n    warningUtils.emit(warningUtils.Codes.VERWAR003);\n    debug('logging stdout enabled');\n    logger = createLogger(pinoConfig, pino.destination(1), loggerConfig.format);\n  } else {\n    debug('logging stdout enabled');\n    logger = createLogger(pinoConfig, pino.destination(1), loggerConfig.format);\n  }\n\n  if (isProd()) {\n    // why only on prod? https://github.com/pinojs/pino/issues/920#issuecomment-710807667\n    const finalHandler = pino.final(logger, (err, finalLogger, event) => {\n      finalLogger.info(`${event} caught`);\n      if (err) {\n        finalLogger.error(err, 'error caused exit');\n      }\n      process.exit(err ? 1 : 0);\n    });\n\n    process.on('uncaughtException', (err) => finalHandler(err, 'uncaughtException'));\n    process.on('unhandledRejection', (err) => finalHandler(err as Error, 'unhandledRejection'));\n    process.on('beforeExit', () => finalHandler(null, 'beforeExit'));\n    process.on('exit', () => finalHandler(null, 'exit'));\n    process.on('uncaughtException', (err) => finalHandler(err, 'uncaughtException'));\n    process.on('SIGINT', () => finalHandler(null, 'SIGINT'));\n    process.on('SIGQUIT', () => finalHandler(null, 'SIGQUIT'));\n    process.on('SIGTERM', () => finalHandler(null, 'SIGTERM'));\n  }\n\n  return logger;\n}\n"],"file":"logger.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@verdaccio/logger",
-	"version": "6.0.0-6-next.5",
+	"version": "6.0.0-6-next.9",
 	"description": "logger",
 	"main": "./build/index.js",
 	"types": "build/index.d.ts",
@@ -26,18 +26,18 @@
 		"verdaccio"
 	],
 	"engines": {
-		"node": ">=10",
+		"node": ">=14",
 		"npm": ">=6"
 	},
 	"dependencies": {
-		"@verdaccio/logger-prettify": "6.0.0-alpha.3",
-		"debug": "4.3.2",
+		"@verdaccio/core": "6.0.0-6-next.4",
+		"@verdaccio/logger-prettify": "6.0.0-6-next.6",
+		"debug": "4.3.3",
 		"lodash": "4.17.21",
-		"pino": "6.2.1"
+		"pino": "7.6.3"
 	},
 	"devDependencies": {
-		"@types/pino": "6.3.3",
-		"@verdaccio/types": "11.0.0-6-next.8"
+		"@verdaccio/types": "11.0.0-6-next.10"
 	},
 	"funding": {
 		"type": "opencollective",

package/src/logger.ts

@@ -1,6 +1,9 @@
-import pino from 'pino';
-import _ from 'lodash';
 import buildDebug from 'debug';
+import _ from 'lodash';
+import pino from 'pino';
+
+import { warningUtils } from '@verdaccio/core';
+import prettifier, { fillInMsgTemplate } from '@verdaccio/logger-prettify';
 
 const debug = buildDebug('verdaccio:logger');
 
@@ -51,6 +54,7 @@ export function createLogger(
   // pretty logs are not allowed in production for performance reasons
   if ((format === DEFAULT_LOG_FORMAT || format !== 'json') && isProd() === false) {
     pinoConfig = Object.assign({}, pinoConfig, {
+      prettifier,
       // more info
       // https://github.com/pinojs/pino-pretty/issues/37
       prettyPrint: {
@@ -58,7 +62,23 @@ export function createLogger(
         prettyStamp: format === 'pretty-timestamped',
         ...prettyPrintOptions,
       },
-      prettifier: require('@verdaccio/logger-prettify'),
+    });
+  } else {
+    pinoConfig = Object.assign({}, pinoConfig, {
+      // more info
+      // https://github.com/pinojs/pino/blob/v7.1.0/docs/api.md#hooks-object
+      hooks: {
+        logMethod(inputArgs, method) {
+          const [templateObject, message, ...otherArgs] = inputArgs;
+          const templateVars =
+            !!templateObject && typeof templateObject === 'object'
+              ? Object.getOwnPropertyNames(templateObject)
+              : [];
+          if (!message || !templateVars.length) return method.apply(this, inputArgs);
+          const hydratedMessage = fillInMsgTemplate(message, templateObject, false);
+          return method.apply(this, [templateObject, hydratedMessage, ...otherArgs]);
+        },
+      },
     });
   }
   const logger = pino(pinoConfig, destination);
@@ -75,7 +95,7 @@ export function createLogger(
 export function getLogger() {
   if (_.isNil(logger)) {
     // FIXME: not sure about display here a warning
-    process.emitWarning('logger is not defined');
+    warningUtils.emit(warningUtils.Codes.VERWAR002);
     return;
   }
 
@@ -102,9 +122,7 @@ export function setup(options: LoggerConfig | LoggerConfigItem = DEFAULT_LOGGER_
   debug('setup logger');
   const isLegacyConf = Array.isArray(options);
   if (isLegacyConf) {
-    const deprecateMessage =
-      'deprecate: multiple logger configuration is deprecated, please check the migration guide.';
-    process.emitWarning(deprecateMessage);
+    warningUtils.emit(warningUtils.Codes.VERDEP002);
   }
 
   // verdaccio 5 does not allow multiple logger configuration
@@ -125,9 +143,7 @@ export function setup(options: LoggerConfig | LoggerConfigItem = DEFAULT_LOGGER_
     debug('logging file enabled');
     logger = createLogger(pinoConfig, pino.destination(loggerConfig.path), loggerConfig.format);
   } else if (loggerConfig.type === 'rotating-file') {
-    process.emitWarning(
-      'rotating-file type is not longer supported, consider use [logrotate] instead'
-    );
+    warningUtils.emit(warningUtils.Codes.VERWAR003);
     debug('logging stdout enabled');
     logger = createLogger(pinoConfig, pino.destination(1), loggerConfig.format);
   } else {

package/test/logger.spec.ts

@@ -1,7 +1,27 @@
+import { warningUtils } from '@verdaccio/core';
+
 import { logger, setup } from '../src';
 
+const mockWarningUtils = jest.fn();
+
+jest.mock('@verdaccio/core', () => {
+  const original = jest.requireActual('@verdaccio/core');
+  return {
+    warningUtils: {
+      ...original.warningUtils,
+      emit: (...args) => {
+        mockWarningUtils(...args);
+      },
+    },
+  };
+});
+
 describe('logger', () => {
-  test('dsadasd', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test.skip('should write message logger', () => {
     jest.spyOn(process.stdout, 'write');
     setup([
       {
@@ -15,7 +35,6 @@ describe('logger', () => {
   });
 
   test('throw deprecation warning if multiple loggers configured', () => {
-    const spy = jest.spyOn(process, 'emitWarning');
     setup([
       {
         level: 'info',
@@ -24,18 +43,11 @@ describe('logger', () => {
         level: 'http',
       },
     ]);
-    expect(spy).toHaveBeenCalledWith(
-      'deprecate: multiple logger configuration is deprecated, please check the migration guide.'
-    );
-    spy.mockRestore();
+    expect(mockWarningUtils).toHaveBeenCalledWith(warningUtils.Codes.VERDEP002);
   });
 
   test('regression: do not throw deprecation warning if no logger config is provided', () => {
-    const spy = jest.spyOn(process, 'emitWarning');
     setup();
-    expect(spy).not.toHaveBeenCalledWith(
-      'deprecate: multiple logger configuration is deprecated, please check the migration guide.'
-    );
-    spy.mockRestore();
+    expect(mockWarningUtils).not.toHaveBeenCalled();
   });
 });