Skip to content

Commit

Permalink
modify the document (#1331)
Browse files Browse the repository at this point in the history
* add document

* modify the document

* format document style
  • Loading branch information
SoberChina authored and wu-sheng committed Jun 8, 2018
1 parent ab82f64 commit a6d9a60
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
14 changes: 10 additions & 4 deletions docs/cn/Deploy-skywalking-agent-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
```
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
```

13 changes: 9 additions & 4 deletions docs/en/Deploy-skywalking-agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
```
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
```

0 comments on commit a6d9a60

Please sign in to comment.