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

Ensure config files have / prefixes

Browse Source
This commit is contained in:
Dave Syer
2016-08-15 15:42:54 +01:00
parent 1a28da5d83
commit 656a1bd75d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java
View File

@@ -136,14 +136,14 @@ public class DeployerThread extends Thread {
private PropertySource<?> extractPropertySource(String path) { private PropertySource<?> extractPropertySource(String path) {
PropertySource<?> source = null; PropertySource<?> source = null;
Resource resource = new ClassPathResource("config/" + path, DeployerThread.class); Resource resource = new ClassPathResource("config" + path, DeployerThread.class);
source = loadPropertySource(resource, path); source = loadPropertySource(resource, path);
if (source==null) { if (source==null) {
resource = new ClassPathResource(path, DeployerThread.class); resource = new ClassPathResource(path, DeployerThread.class);
source = loadPropertySource(resource, path); source = loadPropertySource(resource, path);
} }
if (source==null) { if (source==null) {
resource = new FileSystemResource("config/" + path); resource = new FileSystemResource("config" + path);
source = loadPropertySource(resource, path); source = loadPropertySource(resource, path);
} }
if (source==null) { if (source==null) {
@@ -257,7 +257,7 @@ public class DeployerThread extends Thread {
if (!shouldDeploy("eureka", properties)) { if (!shouldDeploy("eureka", properties)) {
appDefProps.put("eureka.client.enabled", Boolean.FALSE.toString()); appDefProps.put("eureka.client.enabled", Boolean.FALSE.toString());
} }
Map<String, String> map = extractProperties(deployable.getName() + ".yml"); Map<String, String> map = extractProperties("/" + deployable.getName() + ".yml");
for (String key : map.keySet()) { for (String key : map.keySet()) {
appDefProps.put(key, map.get(key)); appDefProps.put(key, map.get(key));
} }