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

Improve log message with active profiles 

Closes gh-4612
This commit is contained in:
Stephane Nicoll 2015-11-26 16:25:52 +01:00
parent 1ff070f6e9
commit 9c412232d5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -650,7 +650,9 @@ public class SpringApplication {
if (log.isInfoEnabled()) {
String[] activeProfiles = context.getEnvironment().getActiveProfiles();
if (ObjectUtils.isEmpty(activeProfiles)) {
log.info("No profiles are active");
String[] defaultProfiles = context.getEnvironment().getDefaultProfiles();
log.info("No active profile set, falling back to default profiles: "
+ StringUtils.arrayToCommaDelimitedString(defaultProfiles));
}
else {
log.info("The following profiles are active: "

3
spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

@ -222,7 +222,8 @@ public class SpringApplicationTests {
SpringApplication application = new SpringApplication(ExampleConfig.class);
application.setWebEnvironment(false);
this.context = application.run();
assertThat(this.output.toString(), containsString("No profiles are active"));
assertThat(this.output.toString(), containsString(
"No active profile set, falling back to default profiles: default"));
}
@Test