From 7eccbc4bac7a565d7a251d5a3021d02f54296ec5 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 4 Mar 2016 09:22:03 +0000
Subject: [PATCH] Make LoggingRebinder case insensitive

Partly to account for the fact that Sprng Boot publishes config
meta data with lower case values (don't ask).
---
 .../cloud/logging/LoggingRebinder.java        |  6 +--
 .../cloud/logging/LoggingRebinderTests.java   | 37 +++++++++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java b/spring-cloud-context/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java
index 7b9663ca..f8098386 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java
@@ -35,8 +35,8 @@ import org.springframework.core.env.Environment;
  * @author Dave Syer
  *
  */
-public class LoggingRebinder implements ApplicationListener<EnvironmentChangeEvent>,
-		EnvironmentAware {
+public class LoggingRebinder
+		implements ApplicationListener<EnvironmentChangeEvent>, EnvironmentAware {
 
 	private final Log logger = LogFactory.getLog(getClass());
 
@@ -71,7 +71,7 @@ public class LoggingRebinder implements ApplicationListener<EnvironmentChangeEve
 				name = null;
 			}
 			level = environment.resolvePlaceholders(level);
-			system.setLogLevel(name, LogLevel.valueOf(level));
+			system.setLogLevel(name, LogLevel.valueOf(level.toUpperCase()));
 		}
 		catch (RuntimeException ex) {
 			this.logger.error("Cannot set level: " + level + " for '" + name + "'");
diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java
index c8b1e14d..81ba3951 100644
--- a/spring-cloud-context/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java
+++ b/spring-cloud-context/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java
@@ -15,9 +15,6 @@
  */
 package org.springframework.cloud.logging;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Collections;
 
 import org.junit.After;
@@ -27,8 +24,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.boot.test.EnvironmentTestUtils;
-import org.springframework.core.env.StandardEnvironment;
 import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
+import org.springframework.core.env.StandardEnvironment;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Dave Syer
@@ -38,20 +38,35 @@ public class LoggingRebinderTests {
 
 	private LoggingRebinder rebinder = new LoggingRebinder();
 	private Logger logger = LoggerFactory.getLogger("org.springframework.web");
-	
+
 	@After
 	public void reset() {
-		LoggingSystem.get(getClass().getClassLoader()).setLogLevel("org.springframework.web", LogLevel.INFO);
+		LoggingSystem.get(getClass().getClassLoader())
+				.setLogLevel("org.springframework.web", LogLevel.INFO);
 	}
 
 	@Test
 	public void logLevelsChanged() {
-		assertFalse(logger.isTraceEnabled());
+		assertFalse(this.logger.isTraceEnabled());
 		StandardEnvironment environment = new StandardEnvironment();
-		EnvironmentTestUtils.addEnvironment(environment, "logging.level.org.springframework.web=TRACE");
-		rebinder.setEnvironment(environment);
-		rebinder.onApplicationEvent(new EnvironmentChangeEvent(Collections.singleton("logging.level.org.springframework.web")));
-		assertTrue(logger.isTraceEnabled());
+		EnvironmentTestUtils.addEnvironment(environment,
+				"logging.level.org.springframework.web=TRACE");
+		this.rebinder.setEnvironment(environment);
+		this.rebinder.onApplicationEvent(new EnvironmentChangeEvent(
+				Collections.singleton("logging.level.org.springframework.web")));
+		assertTrue(this.logger.isTraceEnabled());
+	}
+
+	@Test
+	public void logLevelsLowerCase() {
+		assertFalse(this.logger.isTraceEnabled());
+		StandardEnvironment environment = new StandardEnvironment();
+		EnvironmentTestUtils.addEnvironment(environment,
+				"logging.level.org.springframework.web=trace");
+		this.rebinder.setEnvironment(environment);
+		this.rebinder.onApplicationEvent(new EnvironmentChangeEvent(
+				Collections.singleton("logging.level.org.springframework.web")));
+		assertTrue(this.logger.isTraceEnabled());
 	}
 
 }