Set source-dependent log levels via properties

maarzt · ctrueden · commit 65c10f742397 · 2017-09-21T09:26:31.000+02:00
And test it.

Signed-off-by: Curtis Rueden &lt;ctrueden@wisc.edu&gt;
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -70,6 +70,7 @@ public AbstractLogService(final Properties properties) {
 		if (level >= 0) currentLevel = level;
 		classAndPackageLevels = setupMapFromProperties(properties,
 			LogService.LOG_LEVEL_PROPERTY + ":");
+		initLogSourceLevels(properties);
 	}
 
 	// -- AbstractLogService methods --
@@ -140,6 +141,12 @@ protected String getPrefix(final int level) {
 
 	// -- Helper methods --
 
+	private void initLogSourceLevels(Properties properties) {
+		Map<String, Integer> nameLevels = setupMapFromProperties(properties,
+			LOG_LEVEL_BY_SOURCE_PROPERTY + ":");
+		nameLevels.forEach(this::setLevelForLogger);
+	}
+
 	private int getLevelForClass(String classOrPackageName, int defaultLevel) {
 		// check for a custom log level for calling class or its parent packages
 		while (classOrPackageName != null) {
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -165,6 +165,16 @@ public void testSubLoggerLogLevel() {
 		assertEquals(LogLevel.TRACE, sub.getLevel());
 	}
 
+	@Test
+	public void testSubLoggerLogLevelViaProperties() {
+		Properties properties = new Properties();
+		properties.setProperty(LogService.LOG_LEVEL_BY_SOURCE_PROPERTY + ":Hello:World", LogLevel.prefix(LogLevel.ERROR));
+		properties.setProperty(LogService.LOG_LEVEL_BY_SOURCE_PROPERTY + ":foo:bar", LogLevel.prefix(LogLevel.TRACE));
+		final LogService log = new TestableLogService(properties);
+		Logger sub = log.subLogger("foo").subLogger("bar");
+		assertEquals(LogLevel.TRACE, sub.getLevel());
+	}
+
 	@Test
 	public void testPackageLogLevel() {
 		final LogService log = new TestableLogService();
