From 27505b38b31da1720286277fddfd8bd3cc607497 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 15 Jul 2019 15:04:03 +0200
Subject: [PATCH] fix(logger): migrate last refs to ts
Closes #4094, Closes #4095
---
bin/config-validator.js | 2 --
lib/config/index.js | 4 ++--
lib/logger/__mocks__/index.ts | 1 +
lib/logger/index.ts | 6 ++++++
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/bin/config-validator.js b/bin/config-validator.js
index b874097d16..84116a2eaa 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 09f97e7edf..d5b4aefa70 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 2e09087795..073ffa76d4 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 7d44d27b98..5b96525ff9 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);
}
--
GitLab