Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Environment to shell context; disable shell banner if spring.main.show_banner is set to false

Browse Source
This commit is contained in:
Christian Dupuis 2014-03-20 15:23:24 +01:00
parent 99e6503a07
commit d08d98492d
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
View File

@ -61,6 +61,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.SpringVersion;
import org.springframework.core.env.Environment;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.security.access.AccessDecisionManager;
@ -198,6 +199,9 @@ public class CrshAutoConfiguration {
@Autowired
private ListableBeanFactory beanFactory;
@Autowired
private Environment environment;
@Autowired
private ShellProperties properties;
@ -250,6 +254,9 @@ public class CrshAutoConfiguration {
if (this.beanFactory != null) {
attributes.put("spring.beanfactory", this.beanFactory);
}
if (this.environment != null) {
attributes.put("spring.environment", this.environment);
}
return attributes;
}

5
spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View File

@ -533,8 +533,11 @@ from your command:
|`spring.version`
|The version of the core Spring Framework
|`spring.beanFactory`
|`spring.beanfactory`
|Access to the Spring `BeanFactory`
|`spring.environment`
|Access to the Spring `Environment`
|===

8
spring-boot-starters/spring-boot-starter-shell/src/main/resources/commands/crash/login.groovy
View File

@ -1,11 +1,19 @@
welcome = { ->
if (!crash.context.attributes['spring.environment'].getProperty("spring.main.show_banner", Boolean.class, Boolean.TRUE)) {
return ""
}
// Resolve hostname
def hostName;
try {
hostName = java.net.InetAddress.getLocalHost().getHostName();
} catch (java.net.UnknownHostException ignore) {
hostName = "localhost";
}
// Get Spring Boot version from context
def version = crash.context.attributes.get("spring.boot.version")
return """\
. ____ _ __ _ _
/\\\\ / ___'_ __ _ _(_)_ __ __ _ \\ \\ \\ \\