diff --git a/bin/config-validator.js b/bin/config-validator.js index b874097d1666093dbfaa7504e5aa7d820931e20f..84116a2eaa5b8914f1080e99594cf344c3861f98 100755 --- a/bin/config-validator.js +++ b/bin/config-validator.js @@ -5,11 +5,9 @@ const os = require('os'); const { validateConfig } = require('../dist/config/validation'); const { massageConfig } = require('../dist/config/massage'); const { getConfig } = require('../dist/config/file'); -const { initLogger } = require('../dist/logger'); const cache = require('../dist/workers/global/cache'); const { configFileNames } = require('../dist/config/app-strings'); -initLogger(); // istanbul ignore if if (!global.renovateCache) { cache.init(os.tmpdir()); diff --git a/lib/config/index.js b/lib/config/index.js index 09f97e7edf0b044e468b6e3933926f9b3df6046c..d5b4aefa70d029d6a5b53d0f945f23d2aaa3f9ac 100644 --- a/lib/config/index.js +++ b/lib/config/index.js @@ -1,4 +1,4 @@ -const { logger, levels } = require('../logger'); +const { logger, levels, addStream } = require('../logger'); const definitions = require('./definitions'); const defaultsParser = require('./defaults'); @@ -64,7 +64,7 @@ async function parseConfigs(env, argv) { logger.debug( `Enabling ${config.logFileLevel} logging to ${config.logFile}` ); - logger.addStream({ + addStream({ name: 'logfile', path: config.logFile, level: config.logFileLevel, diff --git a/lib/logger/__mocks__/index.ts b/lib/logger/__mocks__/index.ts index 2e09087795b15241b5fa7c80270cf887bc5cd9b6..073ffa76d47e19660d32d3e62131a18ffca9fde1 100644 --- a/lib/logger/__mocks__/index.ts +++ b/lib/logger/__mocks__/index.ts @@ -15,5 +15,6 @@ loggerLevels.forEach(k => { export const setMeta = jest.fn(); export const levels = jest.fn(); +export const addStream = jest.fn(); export { logger }; diff --git a/lib/logger/index.ts b/lib/logger/index.ts index 7d44d27b988da94f67663f5405a805563778545f..5b96525ff9c8048191168825f6870c743c2cb3d3 100644 --- a/lib/logger/index.ts +++ b/lib/logger/index.ts @@ -88,6 +88,12 @@ export function setMeta(obj: any) { meta = { ...obj }; } +export /* istanbul ignore next */ function addStream( + stream: bunyan.Stream +): void { + bunyanLogger.addStream(stream); +} + export function levels(name: string, level: bunyan.LogLevel): void { bunyanLogger.levels(name, level); }