From 9c412232d5fe0353f0fd117ba438ed080683eee1 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 26 Nov 2015 16:25:52 +0100 Subject: [PATCH] Improve log message with active profiles Closes gh-4612 --- .../main/java/org/springframework/boot/SpringApplication.java | 4 +++- .../java/org/springframework/boot/SpringApplicationTests.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index a8047eb592..56645e8433 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -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: " diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index 90e268e799..a4fba7204d 100644 --- a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -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