Merge pull request log4js-node#648 from tmihalcin/logger-initial-configuration

nomiddlename · web-flow · commit 796e3bd7314d · 2018-01-17T08:11:59.000+11:00
fix: deferred logger configuration.
diff --git a/lib/log4js.js b/lib/log4js.js
@@ -163,6 +163,10 @@ function isMaster() {
  * @return {Logger} instance of logger for the category
  */
 function getLogger(category) {
+  if (!enabled) {
+    configure(process.env.LOG4JS_CONFIG || defaultConfig);
+  }
+
   const cat = category || 'default';
   debug(`creating logger as ${isMaster() ? 'master' : 'worker'}`);
   return new Logger((isMaster() ? sendLogEventToAppender : workerDispatch), cat);
@@ -285,5 +289,3 @@ const log4js = {
 };
 
 module.exports = log4js;
-// set ourselves up
-configure(process.env.LOG4JS_CONFIG || defaultConfig);
diff --git a/test/tap/configuration-test.js b/test/tap/configuration-test.js
@@ -37,7 +37,7 @@ test('log4js configure', (batch) => {
       }
     };
 
-    sandbox.require(
+    const log4js = sandbox.require(
       '../../lib/log4js',
       {
         requires: {
@@ -46,6 +46,8 @@ test('log4js configure', (batch) => {
       }
     );
 
+    log4js.getLogger('test-logger');
+
     delete process.env.LOG4JS_CONFIG;
 
     t.equal(fileRead, 1, 'should load the specified local config file');

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ test('log4js configure', (batch) => {`
`37`	`37`	`}`
`38`	`38`	`};`
`39`	`39`
`40`		`- sandbox.require(`
	`40`	`+ const log4js = sandbox.require(`
`41`	`41`	`'../../lib/log4js',`
`42`	`42`	`{`
`43`	`43`	`requires: {`
`@@ -46,6 +46,8 @@ test('log4js configure', (batch) => {`
`46`	`46`	`}`
`47`	`47`	`);`
`48`	`48`
	`49`	`+ log4js.getLogger('test-logger');`
	`50`	`+`
`49`	`51`	`delete process.env.LOG4JS_CONFIG;`
`50`	`52`
`51`	`53`	`t.equal(fileRead, 1, 'should load the specified local config file');`