haotian2015 closed pull request #1329: tomcat 探针使用说明修改 URL: https://github.com/apache/incubator-skywalking/pull/1329
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/docs/cn/Deploy-skywalking-agent-CN.md b/docs/cn/Deploy-skywalking-agent-CN.md index d4c928b5a0..91ac6ac67d 100644 --- a/docs/cn/Deploy-skywalking-agent-CN.md +++ b/docs/cn/Deploy-skywalking-agent-CN.md @@ -70,14 +70,14 @@ logging.level=DEBUG - Log默认使用文件输出，输出到`/logs`目录中 # Tomcat配置探针FAQ -- Tomcat 7 +- Linux Tomcat 7, Tomcat 8 修改`tomcat/bin/catalina.sh`，在首行加入如下信息 ```shell CATALINA_OPTS="$CATALINA_OPTS -javaagent:/path/to/skywalking-agent/skywalking-agent.jar"; export CATALINA_OPTS ``` -- Tomcat 8 -修改`tomcat/bin/catalina.sh`，在首行加入如下信息 +- Windows Tomcat7, Tomcat 8 +修改`tomcat/bin/catalina.bat`，在首行加入如下信息 ```shell set "CATALINA_OPTS=... -javaagent:E:\apache-tomcat-8.5.20\skywalking-agent\skywalking-agent.jar" ``` \ No newline at end of file diff --git a/docs/en/Deploy-skywalking-agent.md b/docs/en/Deploy-skywalking-agent.md index d3352463e3..a270064cec 100644 --- a/docs/en/Deploy-skywalking-agent.md +++ b/docs/en/Deploy-skywalking-agent.md @@ -30,14 +30,14 @@ New agent package looks like this： - The default logging output folder is `/logs`. # Deploy agent in Tomcat FAQ -- Tomcat 7 +- Linux Tomcat 7, Tomcat 8 Change the first line of `tomcat/bin/catalina.sh`. ```shell CATALINA_OPTS="$CATALINA_OPTS -javaagent:/path/to/skywalking-agent/skywalking-agent.jar"; export CATALINA_OPTS ``` -- Tomcat 8 -Change the first line of `tomcat/bin/catalina.sh`. +- Windows Tomcat7, Tomcat 8 +Change the first line of `tomcat/bin/catalina.bat`. ```shell set "CATALINA_OPTS=-javaagent:E:\apache-tomcat-8.5.20\skywalking-agent\skywalking-agent.jar" ``` \ No newline at end of file ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
