Don't overwrite custom log level config in test mode.

rapidoid · Jul 5, 2017 · 8fca258 · 8fca258
1 parent 72ea220
commit 8fca258
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/Conf.java b/rapidoid-commons/src/main/java/org/rapidoid/config/Conf.java
@@ -103,8 +103,14 @@ static void applyConfig(Config config) {
 				Log.options().fancy(true);
 			}
 
-			String logLevel = LOG.entry("level").or("info");
+			LogLevel logLevel = LOG.entry("level").to(LogLevel.class).getOrNull();
-			Log.setLogLevel(GlobalCfg.quiet() ? LogLevel.ERROR : LogLevel.valueOf(logLevel.toUpperCase()));
+			if (logLevel != null && !Env.test()) {
+				Log.setLogLevel(logLevel);
+			}
+
+			if (GlobalCfg.quiet()) {
+				Log.setLogLevel(LogLevel.ERROR); // overwrite the configured log level in quiet mode
+			}
 		}
 	}