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

Add non-option arguments after "--" to deployer command line

Browse Source 
This allows user to play nice tricks with the deployer configuration (e.g.
changing the spring profile).

Fixes gh-25
This commit is contained in:
Dave Syer
2016-08-16 13:46:42 +01:00
parent 15a2a83fb0
commit 9c443a1c04
7 changed files with 214 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerProperties.java
View File

@@ -77,8 +77,8 @@ public class DeployerProperties {
public String toString() {
final StringBuffer sb = new StringBuffer("DeployerProperties{");
sb.append("deployables=").append(this.deployables);
sb.append("deploy=").append(this.deploy);
sb.append("statusSleepMillis=").append(this.statusSleepMillis);
sb.append(", deploy=").append(this.deploy);
sb.append(", statusSleepMillis=").append(this.statusSleepMillis);
sb.append('}');
return sb.toString();
}

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

@@ -29,8 +29,8 @@ import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.Banner.Mode;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.bind.PropertiesConfigurationFactory;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.env.YamlPropertySourceLoader;
import org.springframework.boot.logging.LogLevel;
@@ -47,7 +47,6 @@ import org.springframework.core.OrderComparator;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
@@ -93,19 +92,7 @@ public class DeployerThread extends Thread {
}
private void list() {
StandardEnvironment environment = new StandardEnvironment();
loadCloudProperties(environment);
DeployerProperties properties = new DeployerProperties();
PropertiesConfigurationFactory<DeployerProperties> factory = new PropertiesConfigurationFactory<>(
properties);
factory.setTargetName("spring.cloud.launcher");
factory.setPropertySources(environment.getPropertySources());
try {
factory.afterPropertiesSet();
properties = factory.getObject();
}
catch (Exception e) {
}
DeployerProperties properties = loadCloudProperties();
if (!properties.getDeployables().isEmpty()) {
Collection<String> names = new ArrayList<>();
for (Deployable deployable : properties.getDeployables()) {
@@ -115,11 +102,20 @@ public class DeployerThread extends Thread {
}
}
private void loadCloudProperties(StandardEnvironment environment) {
String path = "/cloud.yml";
PropertySource<?> source = extractPropertySource(path);
if (source != null) {
environment.getPropertySources().addLast(source);
private DeployerProperties loadCloudProperties() {
final ConfigurableApplicationContext context = new SpringApplicationBuilder(
PropertyPlaceholderAutoConfiguration.class, DeployerConfiguration.class)
.bannerMode(Mode.OFF).logStartupInfo(false).web(false)
.properties("spring.config.name=cloud", "logging.level.ROOT=OFF",
"spring.cloud.launcher.list=true",
"launcher.version=" + getVersion())
.run(this.args);
try {
return context.getBean(DeployerProperties.class);
}
finally {
context.close();
}
}
@@ -180,8 +176,10 @@ public class DeployerThread extends Thread {
final ConfigurableApplicationContext context = new SpringApplicationBuilder(
PropertyPlaceholderAutoConfiguration.class, DeployerConfiguration.class)
.web(false).properties("spring.config.name=cloud",
"banner.location=launcher-banner.txt", "launcher.version="+getVersion())
.web(false)
.properties("spring.config.name=cloud",
"banner.location=launcher-banner.txt",
"launcher.version=" + getVersion())
.run(this.args);
final AppDeployer deployer = context.getBean(AppDeployer.class);