Browse Source

Polish contribution

Closes gh-4456
pull/4455/merge
Stephane Nicoll 10 years ago
parent
commit
ba2aea4ef1
  1. 8
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java
  2. 4
      spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java

8
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java

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

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

@ -137,13 +137,13 @@ public class CrshAutoConfigurationTests { @@ -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) {

Loading…
Cancel
Save