Commit 9c412232 authored by Stephane Nicoll's avatar Stephane Nicoll

Improve log message with active profiles

Closes gh-4612
parent 1ff070f6
......@@ -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: "
......
......@@ -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
......
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