lianxuify
diff --git a/‎lib/levels.js
Lines changed: 5 additions & 0 deletions b/‎lib/levels.js
Lines changed: 5 additions & 0 deletions
diff --git a/‎test/tap/configuration-validation-test.js
Lines changed: 8 additions & 0 deletions b/‎test/tap/configuration-validation-test.js
Lines changed: 8 additions & 0 deletions
diff --git a/‎test/tap/levels-test.js
Lines changed: 2 additions & 1 deletion b/‎test/tap/levels-test.js
Lines changed: 2 additions & 1 deletion
@@ -34,6 +34,11 @@ class Level {
       return sArg;
     }
 
+    // a json-serialised level won't be an instance of Level (see issue #768)
+    if (sArg instanceof Object && sArg.levelStr) {
+      sArg = sArg.levelStr;
+    }
+
     if (typeof sArg === 'string') {
       return Level[sArg.toUpperCase()] || defaultLevel;
     }
 
@@ -337,5 +337,13 @@ test('log4js configuration validation', (batch) => {
     t.end();
   });
 
+  batch.test('should not give error if level object is used instead of string', (t) => {
+    t.doesNotThrow(() => log4js.configure({
+      appenders: { thing: { type: 'stdout' } },
+      categories: { default: { appenders: ['thing'], level: log4js.levels.ERROR } }
+    }));
+    t.end();
+  });
+
   batch.end();
 });
@@ -377,12 +377,13 @@ test('levels', (batch) => {
     t.end();
   });
 
-  batch.test('toLevel', (t) => {
+  batch.test('getLevel', (t) => {
     t.equal(levels.getLevel('debug'), levels.DEBUG);
     t.equal(levels.getLevel('DEBUG'), levels.DEBUG);
     t.equal(levels.getLevel('DeBuG'), levels.DEBUG);
     t.notOk(levels.getLevel('cheese'));
     t.equal(levels.getLevel('cheese', levels.DEBUG), levels.DEBUG);
+    t.equal(levels.getLevel({ level: 10000, levelStr: 'DEBUG', colour: 'cyan' }), levels.DEBUG);
     t.end();
   });
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,11 @@ class Level {`
`34`	`34`	`return sArg;`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ // a json-serialised level won't be an instance of Level (see issue #768)`
	`38`	`+ if (sArg instanceof Object && sArg.levelStr) {`
	`39`	`+ sArg = sArg.levelStr;`
	`40`	`+ }`
	`41`	`+`
`37`	`42`	`if (typeof sArg === 'string') {`
`38`	`43`	`return Level[sArg.toUpperCase()] \|\| defaultLevel;`
`39`	`44`	`}`