root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

ENsure Vcap initializer runs before config file parser 

Fixes gh-119.
This commit is contained in:
Dave Syer 2013-11-17 15:29:12 +00:00
parent 2f7214002d
commit 17de6689ab
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot/src/main/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializer.java
View File

@ -63,7 +63,7 @@ import org.springframework.util.StringUtils;
* to <code>vcap.application.*</code> in a fairly obvious way, and the VCAP_SERVICES * to <code>vcap.application.*</code> in a fairly obvious way, and the VCAP_SERVICES
* object is unwrapped so that it is a hash of objects with key equal to the service * object is unwrapped so that it is a hash of objects with key equal to the service
* instance name (e.g. "mysql" in the example above), and value equal to that instances * instance name (e.g. "mysql" in the example above), and value equal to that instances
* properties, and then flattened in the smae way. E.g. * properties, and then flattened in the same way. E.g.
* *
* <pre> * <pre>
* vcap.application.instance_id: 2ce0ac627a6c8e47e936d829a3a47b5b * vcap.application.instance_id: 2ce0ac627a6c8e47e936d829a3a47b5b
@ -81,6 +81,10 @@ import org.springframework.util.StringUtils;
* ... * ...
* </pre> * </pre>
* *
* N.B. this initializer is mainly intended for informational use (the application and
* instance ids are particularly useful). For service binding you might find that Spring
* Cloud is more convenient and more robust against potential changes in Cloud Foundry.
*
* @author Dave Syer * @author Dave Syer
*/ */
public class VcapApplicationContextInitializer implements public class VcapApplicationContextInitializer implements
@ -93,7 +97,9 @@ public class VcapApplicationContextInitializer implements
private static final String VCAP_SERVICES = "VCAP_SERVICES"; private static final String VCAP_SERVICES = "VCAP_SERVICES";
private int order = Integer.MIN_VALUE + 11; // Intentionally before ConfigFileApplicationContextInitializer so values there can
// use these ones
private int order = Integer.MIN_VALUE + 9;
private JsonParser parser = JsonParserFactory.getJsonParser(); private JsonParser parser = JsonParserFactory.getJsonParser();
@ -188,7 +194,7 @@ public class VcapApplicationContextInitializer implements
} }
} }
catch (Exception ex) { catch (Exception ex) {
logger.error("Could not parse VCAP_APPLICATION", ex); logger.error("Could not parse VCAP_SERVICES", ex);
} }
return properties; return properties;
} }