From f6d9fb620bb516cd993e21ac2881d2106dc961bb Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 13 Sep 2018 21:13:52 +0200
Subject: [PATCH] refactor(logs): log configs after log file created
Closes #2515
---
lib/config/index.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/config/index.js b/lib/config/index.js
index 3936ce757e..cac374e533 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -43,13 +43,10 @@ async function parseConfigs(env, argv) {
const cliConfig = await resolveConfigPresets(cliParser.getConfig(argv));
const envConfig = await resolveConfigPresets(envParser.getConfig(env));
- logger.debug({ config: fileConfig }, 'File config');
- logger.debug({ config: cliConfig }, 'CLI config');
- logger.debug({ config: envConfig }, 'Env config');
-
let config = mergeChildConfig(fileConfig, envConfig);
config = mergeChildConfig(config, cliConfig);
- logger.debug({ config }, 'Combined config');
+
+ const combinedConfig = config;
config = mergeChildConfig(defaultConfig, config);
@@ -78,6 +75,10 @@ async function parseConfigs(env, argv) {
}
logger.trace({ config: defaultConfig }, 'Default config');
+ logger.debug({ config: fileConfig }, 'File config');
+ logger.debug({ config: cliConfig }, 'CLI config');
+ logger.debug({ config: envConfig }, 'Env config');
+ logger.debug({ config: combinedConfig }, 'Combined config');
// Get global config
logger.trace({ config }, 'Full config');
--
GitLab