|
|
@ -38,7 +38,6 @@ import org.springframework.boot.logging.LogFile; |
|
|
|
import org.springframework.boot.logging.LoggingInitializationContext; |
|
|
|
import org.springframework.boot.logging.LoggingInitializationContext; |
|
|
|
import org.springframework.boot.logging.LoggingSystem; |
|
|
|
import org.springframework.boot.logging.LoggingSystem; |
|
|
|
import org.springframework.cloud.bootstrap.BootstrapApplicationListener; |
|
|
|
import org.springframework.cloud.bootstrap.BootstrapApplicationListener; |
|
|
|
import org.springframework.cloud.bootstrap.BootstrapConfigFileApplicationListener; |
|
|
|
|
|
|
|
import org.springframework.cloud.context.environment.EnvironmentChangeEvent; |
|
|
|
import org.springframework.cloud.context.environment.EnvironmentChangeEvent; |
|
|
|
import org.springframework.cloud.logging.LoggingRebinder; |
|
|
|
import org.springframework.cloud.logging.LoggingRebinder; |
|
|
|
import org.springframework.context.ApplicationContextInitializer; |
|
|
|
import org.springframework.context.ApplicationContextInitializer; |
|
|
@ -302,9 +301,7 @@ public class PropertySourceBootstrapConfiguration implements ApplicationListener |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else { |
|
|
|
else { |
|
|
|
Collections.addAll(profiles, getProfilesForValue( |
|
|
|
Collections.addAll(profiles, getProfilesForValue(propertySource.getProperty(property), environment)); |
|
|
|
propertySource.getProperty(BootstrapConfigFileApplicationListener.INCLUDE_PROFILES_PROPERTY), |
|
|
|
|
|
|
|
environment)); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return profiles; |
|
|
|
return profiles; |
|
|
|
} |
|
|
|
} |
|
|
|