diff --git a/bin/as.bat b/bin/as.bat index 71b4c3a63..a56f44d8e 100644 --- a/bin/as.bat +++ b/bin/as.bat @@ -66,7 +66,6 @@ set ERROR_CODE=%ERRORLEVEL% goto endNT :attachSuccess -REM %JAVACMD% -Dfile.encoding=UTF-8 -Djava.awt.headless=true -cp "%CORE_JAR%" com.taobao.arthas.core.ArthasConsole 127.0.0.1 3658 telnet 127.0.0.1 3658 REM set local scope for the variables with windows NT shell diff --git a/bin/as.sh b/bin/as.sh index df49ebc7d..ead413768 100755 --- a/bin/as.sh +++ b/bin/as.sh @@ -365,38 +365,18 @@ attach_jvm() echo "Attaching to ${TARGET_PID} using version ${1}..." + echo ${ARTHAS_OPTS} + if [ ${TARGET_IP} = ${DEFAULT_TARGET_IP} ]; then - if [[ "${arthas_version}" > "3.0" ]]; then - ${JAVA_HOME}/bin/java \ - ${ARTHAS_OPTS} ${BOOT_CLASSPATH} ${JVM_OPTS} \ - -jar ${arthas_lib_dir}/arthas-core.jar \ - -pid ${TARGET_PID} \ - -target-ip ${TARGET_IP} \ - -telnet-port ${TELNET_PORT} \ - -http-port ${HTTP_PORT} \ - -core "${arthas_lib_dir}/arthas-core.jar" \ - -agent "${arthas_lib_dir}/arthas-agent.jar" - else - # for compatibility - ${JAVA_HOME}/bin/java \ - ${ARTHAS_OPTS} ${BOOT_CLASSPATH} ${JVM_OPTS} \ - -jar ${arthas_lib_dir}/arthas-core.jar \ - -pid ${TARGET_PID} \ - -target ${TARGET_IP}":"${TELNET_PORT} \ - -core "${arthas_lib_dir}/arthas-core.jar" \ - -agent "${arthas_lib_dir}/arthas-agent.jar" - - # verify_pid - echo "help" > /tmp/command - PID=`${JAVA_HOME}/bin/java -cp ${arthas_lib_dir}/arthas-core.jar ${ARTHAS_OPTS}\ - com.taobao.arthas.core.ArthasConsole ${TARGET_IP} ${TELNET_PORT} -b -f /tmp/command \ - | grep PID | awk '{print $2}'` - rm /tmp/command - if [ ! -z ${PID} ] && [ "${PID}" != "${TARGET_PID}" ]; then - echo "WARNING: Arthas server is running on ${PID} instead of ${TARGET_PID}, exiting." - exit 1 - fi - fi + ${JAVA_HOME}/bin/java \ + ${ARTHAS_OPTS} ${BOOT_CLASSPATH} ${JVM_OPTS} \ + -jar ${arthas_lib_dir}/arthas-core.jar \ + -pid ${TARGET_PID} \ + -target-ip ${TARGET_IP} \ + -telnet-port ${TELNET_PORT} \ + -http-port ${HTTP_PORT} \ + -core "${arthas_lib_dir}/arthas-core.jar" \ + -agent "${arthas_lib_dir}/arthas-agent.jar" fi }