root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-01-15 09:46:07 +01:00
parent 752a91c75b de912c4c50
commit e4876eb666
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/LoggersMvcEndpoint.java
View File

@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
* Adapter to expose {@link LoggersEndpoint} as an {@link MvcEndpoint}. * Adapter to expose {@link LoggersEndpoint} as an {@link MvcEndpoint}.
* *
* @author Ben Hale * @author Ben Hale
* @author Kazuki Shimizu
* @since 1.5.0 * @since 1.5.0
*/ */
@ConfigurationProperties(prefix = "endpoints.loggers") @ConfigurationProperties(prefix = "endpoints.loggers")
@ -71,7 +72,8 @@ public class LoggersMvcEndpoint extends EndpointMvcAdapter {
return getDisabledResponse(); return getDisabledResponse();
} }
String level = configuration.get("configuredLevel"); 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; return HttpEntity.EMPTY;
} }

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/LoggersMvcEndpointTests.java
View File

@ -131,7 +131,7 @@ public class LoggersMvcEndpointTests {
@Test @Test
public void setLoggerShouldSetLogLevel() throws Exception { public void setLoggerShouldSetLogLevel() throws Exception {
this.mvc.perform(post("/loggers/ROOT").contentType(MediaType.APPLICATION_JSON) 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); verify(this.loggingSystem).setLogLevel("ROOT", LogLevel.DEBUG);
} }