From 045b88f7c36773433ee74551f3c2557f13a0f90d Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Thu, 15 Sep 2016 12:48:12 -0600
Subject: [PATCH] Look for launched server config files in ~/.spring-cloud/

Also moved some debug to trace

fixes gh-31
---
 .../launcher/deployer/DeployerThread.java     | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java
index 36e6458..0b57bc3 100644
--- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java
+++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerThread.java
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.launcher.deployer;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -63,6 +64,7 @@ public class DeployerThread extends Thread {
 	private static final Logger logger = LoggerFactory.getLogger(DeployerThread.class);
 
 	private static final String DEFAULT_VERSION = "1.2.0.BUILD-SNAPSHOT";
+	public static final String DIRECTORY_NAME = ".spring-cloud";
 
 	private Map<String, DeploymentState> deployed = new ConcurrentHashMap<>();
 
@@ -151,9 +153,31 @@ public class DeployerThread extends Thread {
 			resource = new FileSystemResource("." + path);
 			source = loadPropertySource(resource, path);
 		}
+		if (source == null) {
+			File home = getHomeFolder();
+			File springCloudDir = (home == null ? null : new File(home, DIRECTORY_NAME));
+			if (logger.isDebugEnabled() && springCloudDir != null) {
+				logger.debug("~/.spring-cloud directory: {}, exists: {}, isDir: {}", springCloudDir,
+						springCloudDir.exists(),  springCloudDir.isDirectory());
+			} else if (logger.isDebugEnabled()){
+				logger.debug("no ~/.spring-cloud directory");
+			}
+			if (springCloudDir != null && springCloudDir.exists() && springCloudDir.isDirectory()) {
+				resource = new FileSystemResource(new File(springCloudDir, path));
+				source = loadPropertySource(resource, path);
+			}
+		}
 		return source;
 	}
 
+	protected File getHomeFolder() {
+		String home = System.getProperty("user.home");
+		if (StringUtils.hasLength(home)) {
+			return new File(home);
+		}
+		return null;
+	}
+
 	private PropertySource<?> loadPropertySource(Resource resource, String path) {
 		if (resource.exists()) {
 			try {
@@ -298,7 +322,7 @@ public class DeployerThread extends Thread {
 						&& appStatus.getState() != DeploymentState.failed) {
 					Thread.sleep(properties.getStatusSleepMillis());
 					appStatus = getAppStatus(deployer, id);
-					logger.debug("State of {} = {}", id, appStatus.getState());
+					logger.trace("State of {} = {}", id, appStatus.getState());
 				}
 			}
 			catch (Exception e) {
@@ -316,7 +340,7 @@ public class DeployerThread extends Thread {
 
 	private boolean shouldDeploy(String name, DeployerProperties properties) {
 		boolean deploy = properties.getDeploy().contains(name);
-		logger.debug("shouldDeploy {} = {}", name, deploy);
+		logger.trace("shouldDeploy {} = {}", name, deploy);
 		return deploy;
 	}