Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish contribution

Browse Source 
Closes gh-4456
This commit is contained in:
Stephane Nicoll
2015-11-13 10:13:44 +01:00
parent 41300c35ab
commit ba2aea4ef1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java
View File

@@ -243,16 +243,16 @@ public class ShellProperties {
*/
private Integer port = 2000;
/**
* Number of milliseconds after which unused connections are closed.
*/
private Integer idleTimeout = 600000;
/**
* Number of milliseconds after user will be prompted to login again.
*/
private Integer authTimeout = 600000;
/**
* Number of milliseconds after which unused connections are closed.
*/
private Integer idleTimeout = 600000;
@Override
protected void applyToCrshShellConfig(Properties config) {
if (this.enabled) {

4
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java
View File

@@ -137,13 +137,13 @@ public class CrshAutoConfigurationTests {
MockEnvironment env = new MockEnvironment();
env.setProperty("shell.ssh.enabled", "true");
env.setProperty("shell.ssh.auth-timeout", "300000");
env.setProperty("shell.ssh.idle-timeout", "300000");
env.setProperty("shell.ssh.idle-timeout", "400000");
load(env);
PluginLifeCycle lifeCycle = this.context.getBean(PluginLifeCycle.class);
assertEquals("300000", lifeCycle.getConfig().getProperty("crash.ssh.auth_timeout"));
assertEquals("300000", lifeCycle.getConfig().getProperty("crash.ssh.idle_timeout"));
assertEquals("400000", lifeCycle.getConfig().getProperty("crash.ssh.idle_timeout"));
}
private void load(MockEnvironment env) {