github/arthas
4
0
Fork 0
mirror of https://github.com/alibaba/arthas.git synced 2024-04-21 10:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove old compatibility code in as.sh. #92

Browse Source
This commit is contained in:
hengyunabc
2018-09-20 14:47:33 +08:00
parent f45f401c49
commit bb945824bc
2 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/as.bat
-1
View File
@@ -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
bin/as.sh
+11 -31
View File
@@ -365,38 +365,18 @@ attach_jvm()
echo "Attaching to ${TARGET_PID} using version ${1}..."
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"
echo ${ARTHAS_OPTS}
# 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
if [ ${TARGET_IP} = ${DEFAULT_TARGET_IP} ]; 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"
fi
}