SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix application name always being "bootstrap"

Browse Source
This commit is contained in:
Dave Syer
2014-10-30 07:17:02 +00:00
parent 84962cefca
commit 010d29c124
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
View File

@@ -98,8 +98,8 @@ public class BootstrapApplicationListener implements
if (StringUtils.hasText(configLocation)) {
bootstrapMap.put("spring.config.location", configName);
}
bootstrapMap.put("spring.application.name", configName);
bootstrapProperties.addFirst(new MapPropertySource(BOOTSTRAP_PROPERTY_SOURCE_NAME, bootstrapMap));
bootstrapProperties.addFirst(new MapPropertySource(
BOOTSTRAP_PROPERTY_SOURCE_NAME, bootstrapMap));
bootstrapProperties.addFirst(new MapPropertySource("bootstrapInProgress",
Collections.<String, Object> emptyMap()));
for (PropertySource<?> source : environment.getPropertySources()) {
@@ -112,7 +112,8 @@ public class BootstrapApplicationListener implements
// TODO: is it possible or sensible to share a ResourceLoader?
SpringApplicationBuilder builder = new SpringApplicationBuilder()
.profiles(environment.getActiveProfiles()).showBanner(false)
.environment(bootstrapEnvironment).web(false);
.environment(bootstrapEnvironment)
.properties("spring.application.name:" + configName).web(false);
List<Class<?>> sources = new ArrayList<Class<?>>();
for (String name : names) {
Class<?> cls = ClassUtils.resolveClassName(name, null);