Commit de912c4c authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #7914 from kazuki43zoo:allow-lowercase-on-logger-endpoint

* pr/7914:
  Polish contribution
  Allow lowercase logger level on MVC endpoint
parents de1d450a f21c7673
......@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
* Adapter to expose {@link LoggersEndpoint} as an {@link MvcEndpoint}.
*
* @author Ben Hale
* @author Kazuki Shimizu
* @since 1.5.0
*/
@ConfigurationProperties(prefix = "endpoints.loggers")
......@@ -71,7 +72,8 @@ public class LoggersMvcEndpoint extends EndpointMvcAdapter {
return getDisabledResponse();
}
String level = configuration.get("configuredLevel");
this.delegate.setLogLevel(name, level == null ? null : LogLevel.valueOf(level));
LogLevel logLevel = level == null ? null : LogLevel.valueOf(level.toUpperCase());
this.delegate.setLogLevel(name, logLevel);
return HttpEntity.EMPTY;
}
......
......@@ -131,7 +131,7 @@ public class LoggersMvcEndpointTests {
@Test
public void setLoggerShouldSetLogLevel() throws Exception {
this.mvc.perform(post("/loggers/ROOT").contentType(MediaType.APPLICATION_JSON)
.content("{\"configuredLevel\":\"DEBUG\"}")).andExpect(status().isOk());
.content("{\"configuredLevel\":\"debug\"}")).andExpect(status().isOk());
verify(this.loggingSystem).setLogLevel("ROOT", LogLevel.DEBUG);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment