From 18cc2b0165026ef6bfccea842331c0e7df482f6c Mon Sep 17 00:00:00 2001 From: hengyunabc Date: Fri, 16 Nov 2018 16:25:12 +0800 Subject: [PATCH] fix default timeout. #296 --- core/src/main/java/com/taobao/arthas/core/Arthas.java | 3 +-- .../main/java/com/taobao/arthas/core/config/Configure.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/taobao/arthas/core/Arthas.java b/core/src/main/java/com/taobao/arthas/core/Arthas.java index 727cb91b8..1478b2d85 100644 --- a/core/src/main/java/com/taobao/arthas/core/Arthas.java +++ b/core/src/main/java/com/taobao/arthas/core/Arthas.java @@ -4,7 +4,6 @@ import com.sun.tools.attach.VirtualMachine; import com.sun.tools.attach.VirtualMachineDescriptor; import com.taobao.arthas.common.AnsiLog; import com.taobao.arthas.core.config.Configure; -import com.taobao.arthas.core.shell.ShellServerOptions; import com.taobao.middleware.cli.CLI; import com.taobao.middleware.cli.CLIs; import com.taobao.middleware.cli.CommandLine; @@ -36,7 +35,7 @@ public class Arthas { Option httpPort = new TypedOption().setType(Integer.class) .setShortName("http-port").setDefaultValue(DEFAULT_HTTP_PORT); Option sessionTimeout = new TypedOption().setType(Integer.class) - .setShortName("session-timeout").setDefaultValue("" + ShellServerOptions.DEFAULT_SESSION_TIMEOUT); + .setShortName("session-timeout").setDefaultValue("" + Configure.DEFAULT_SESSION_TIMEOUT_SECONDS); CLI cli = CLIs.create("arthas").addOption(pid).addOption(core).addOption(agent).addOption(target) .addOption(telnetPort).addOption(httpPort).addOption(sessionTimeout); CommandLine commandLine = cli.parse(Arrays.asList(args)); diff --git a/core/src/main/java/com/taobao/arthas/core/config/Configure.java b/core/src/main/java/com/taobao/arthas/core/config/Configure.java index d01715e8a..ad351fb0d 100644 --- a/core/src/main/java/com/taobao/arthas/core/config/Configure.java +++ b/core/src/main/java/com/taobao/arthas/core/config/Configure.java @@ -16,7 +16,7 @@ import static java.lang.reflect.Modifier.isStatic; * @author hengyunabc 2018-11-12 */ public class Configure { - + public static final long DEFAULT_SESSION_TIMEOUT_SECONDS = ShellServerOptions.DEFAULT_SESSION_TIMEOUT/1000; private String ip; private int telnetPort; private int httpPort; @@ -26,9 +26,8 @@ public class Configure { /** * session timeout seconds - * @see com.taobao.arthas.core.shell.ShellServerOptions#DEFAULT_SESSION_TIMEOUT */ - private long sessionTimeout = ShellServerOptions.DEFAULT_SESSION_TIMEOUT/1000; + private long sessionTimeout = DEFAULT_SESSION_TIMEOUT_SECONDS; public String getIp() { return ip;