You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/06/08 10:15:37 UTC
[incubator-skywalking] branch master updated: modify the document
(#1331)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new a6d9a60 modify the document (#1331)
a6d9a60 is described below
commit a6d9a605ed266a70286423ca241934038bca2b61
Author: 李伟高 <so...@gmail.com>
AuthorDate: Fri Jun 8 18:15:19 2018 +0800
modify the document (#1331)
* add document
* modify the document
* format document style
---
docs/cn/Deploy-skywalking-agent-CN.md | 14 ++++++++++----
docs/en/Deploy-skywalking-agent.md | 13 +++++++++----
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/docs/cn/Deploy-skywalking-agent-CN.md b/docs/cn/Deploy-skywalking-agent-CN.md
index 91ac6ac..1dd07aa 100644
--- a/docs/cn/Deploy-skywalking-agent-CN.md
+++ b/docs/cn/Deploy-skywalking-agent-CN.md
@@ -70,14 +70,20 @@ logging.level=DEBUG
- Log默认使用文件输出,输出到`/logs`目录中
# Tomcat配置探针FAQ
-- Linux Tomcat 7, Tomcat 8
+- 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
```
-- Windows Tomcat7, Tomcat 8
+- Windows Tomcat 7, 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
+set "CATALINA_OPTS=-javaagent:/path/to/skywalking-agent/skywalking-agent.jar"
+```
+- JAR 部署
+修改启动命令添加启动参数`-javaagent`
+ ```shell
+ java -javaagent:/path/to/skywalking-agent/skywalking-agent.jar -jar yourApp.jar
+ ```
+
diff --git a/docs/en/Deploy-skywalking-agent.md b/docs/en/Deploy-skywalking-agent.md
index a270064..8ddcb5a 100644
--- a/docs/en/Deploy-skywalking-agent.md
+++ b/docs/en/Deploy-skywalking-agent.md
@@ -30,14 +30,19 @@ New agent package looks like this:
- The default logging output folder is `/logs`.
# Deploy agent in Tomcat FAQ
-- Linux Tomcat 7, Tomcat 8
+- 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
```
-- Windows Tomcat7, Tomcat 8
+- Windows Tomcat 7, 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
+set "CATALINA_OPTS=-javaagent:/path/to/skywalking-agent/skywalking-agent.jar"
+```
+- JAR file
+Add `-javaagent` argument to command line in which you start your app. And make sure to add it before the `-jar` argument. eg:
+ ```shell
+ java -javaagent:/path/to/skywalking-agent/skywalking-agent.jar -jar yourApp.jar
+ ```
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.