Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
f9e7298a
S
SkyWalking
项目概览
山不在高_有仙则灵
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
12
Star
0
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f9e7298a
编写于
9月 13, 2017
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change log component.
上级
db57d8de
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
51 addition
and
43 deletion
+51
-43
apm-collector/apm-collector-boot/bin/collector-service.bat
apm-collector/apm-collector-boot/bin/collector-service.bat
+8
-5
apm-collector/apm-collector-boot/bin/collector-service.sh
apm-collector/apm-collector-boot/bin/collector-service.sh
+3
-3
apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
...llector/apm-collector-boot/src/main/assembly/assembly.xml
+2
-2
apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
...ollector/apm-collector-boot/src/main/resources/log4j2.xml
+26
-0
apm-collector/apm-collector-boot/src/main/resources/logback.xml
...llector/apm-collector-boot/src/main/resources/logback.xml
+0
-27
apm-collector/pom.xml
apm-collector/pom.xml
+12
-6
未找到文件。
apm-collector/apm-collector-boot/bin/collector-service.bat
浏览文件 @
f9e7298a
...
@@ -3,15 +3,18 @@
...
@@ -3,15 +3,18 @@
setlocal
setlocal
set
COLLECOTR_PROCESS_TITLE
=
Skywalking
-Collector
set
COLLECOTR_PROCESS_TITLE
=
Skywalking
-Collector
set
COLLECTOR_BASE_PATH
=
%~dp0
%
..
set
COLLECTOR_BASE_PATH
=
%~dp0
%
..
set
COLLECTOR_RUNTIME_OPTIONS
=
"-Xms256M -Xmx512M"
set
COLLECTOR_RUNTIME_OPTIONS
=
"-Xms256M -Xmx512M
-Dcollector.logDir=
%COLLECTOR_BASE_PATH%
\logs
"
set
CLASSPATH
=
%COLLECTOR_BASE_PATH%
\config
;
set
CLASSPATH
=
%COLLECTOR_BASE_PATH%
\config
;
SET
CLASSPATH
=
%COLLECTOR_BASE_PATH%
\libs\
*;
%CLASSPATH%
SET
CLASSPATH
=
%COLLECTOR_BASE_PATH%
\libs\
*;
%CLASSPATH%
if
""
%JAVA_HOME%
""
==
""""
(
if
defined
JAVA_HOME
(
set
_EXECJAVA
=
"
%JAVA
_HOME:"
=
%
"\bin\java
)
if not defined JAVA_HOME (
echo "
JAVA_HOME
not
set
.
"
set _EXECJAVA=java
set _EXECJAVA=java
)
else
(
set
_EXECJAVA
=
"
%JAVA_HOME%
"
/bin/java
)
)
start /MIN "
%COLLECOTR_PROCESS_TITLE%
"
%_EXECJAVA%
"
%COLLECTOR_RUNTIME_OPTIONS%
" -cp "
%CLASSPATH%
" org.skywalking.apm.collector.boot.CollectorBootStartUp &
start /MIN "
%COLLECOTR_PROCESS_TITLE%
"
%_EXECJAVA%
"
%COLLECTOR_RUNTIME_OPTIONS%
" -cp "
%CLASSPATH%
" org.skywalking.apm.collector.boot.CollectorBootStartUp &
...
...
apm-collector/apm-collector-boot/bin/collector-service.sh
浏览文件 @
f9e7298a
...
@@ -19,9 +19,9 @@ for i in "$COLLECTOR_HOME"/libs/*.jar
...
@@ -19,9 +19,9 @@ for i in "$COLLECTOR_HOME"/libs/*.jar
do
do
CLASSPATH
=
"
$i
:
$CLASSPATH
"
CLASSPATH
=
"
$i
:
$CLASSPATH
"
done
done
COLLECTOR_OPTIONS
=
" -Dcollector.logDir=
$COLLECTOR_LOGS_DIR
"
echo
"Starting collector...."
echo
"Starting collector...."
eval exec
"
\"
$_RUNJAVA
\"
${
JAVA_OPTS
}
-classpath
$CLASSPATH
org.skywalking.apm.collector.boot.CollectorBootStartUp
\
eval exec
"
\"
$_RUNJAVA
\"
${
JAVA_OPTS
}
${
COLLECTOR_OPTIONS
}
-classpath
$CLASSPATH
org.skywalking.apm.collector.boot.CollectorBootStartUp
\
2>
${
COLLECTOR_LOGS_DIR
}
/collector.log 1> /dev/null &"
2>
${
COLLECTOR_LOGS_DIR
}
/collector.log 1> /dev/null &"
retval
=
$?
retval
=
$?
...
...
apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
浏览文件 @
f9e7298a
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<directory>
src/main/resources
</directory>
<directory>
src/main/resources
</directory>
<includes>
<includes>
<include>
application.yml
</include>
<include>
application.yml
</include>
<include>
log
back
.xml
</include>
<include>
log
4j2
.xml
</include>
</includes>
</includes>
<outputDirectory>
/config
</outputDirectory>
<outputDirectory>
/config
</outputDirectory>
</fileSet>
</fileSet>
...
...
apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
0 → 100644
浏览文件 @
f9e7298a
<?xml version="1.0" encoding="UTF-8"?>
<Configuration
status=
"error"
>
<Properties>
<Property
name=
"log-path"
>
${sys:collector.logDir}
</Property>
</Properties>
<Appenders>
<RollingFile
name=
"RollingFile"
fileName=
"${log-path}/skywalking-collector.log"
filePattern=
"${log-path}/skywalking-web-server-%d{yyyy-MM-dd}-%i.log"
>
<PatternLayout>
<pattern>
%d - %c -%-4r [%t] %-5p %x - %m%n
</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy
size=
"102400KB"
/>
</Policies>
<DefaultRolloverStrategy
max=
"30"
/>
</RollingFile>
</Appenders>
<Loggers>
<logger
name=
"org.eclipse.jetty"
level=
"INFO"
/>
<logger
name=
"org.apache.zookeeper"
level=
"INFO"
/>
<logger
name=
"org.skywalking.apm.collector.agentstream.worker.storage.PersistenceTimer"
level=
"INFO"
/>
<Root
level=
"info"
>
<AppenderRef
ref=
"RollingFile"
/>
</Root>
</Loggers>
</Configuration>
apm-collector/apm-collector-boot/src/main/resources/logback.xml
已删除
100644 → 0
浏览文件 @
db57d8de
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<property
name=
"LOG_PATH"
value=
"../logs"
/>
<appender
name=
"STDOUT"
class=
"ch.qos.logback.core.ConsoleAppender"
>
<layout
class=
"ch.qos.logback.classic.PatternLayout"
>
<Pattern>
%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
</Pattern>
</layout>
</appender>
<appender
name=
"FILE"
class=
"ch.qos.logback.core.FileAppender"
>
<file>
${LOG_PATH}/skywalking-server-log4j2.log
</file>
<append>
true
</append>
<immediateFlush>
true
</immediateFlush>
<encoder>
<Pattern>
%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
</Pattern>
</encoder>
</appender>
<logger
name=
"org.skywalking.apm.collector.agentstream.worker.storage.PersistenceTimer"
level=
"INFO"
/>
<logger
name=
"org.eclipse.jetty"
level=
"INFO"
/>
<logger
name=
"org.apache.zookeeper"
level=
"INFO"
/>
<root
level=
"info"
>
<appender-ref
ref=
"STDOUT"
/>
<appender-ref
ref=
"FILE"
/>
</root>
</configuration>
\ No newline at end of file
apm-collector/pom.xml
浏览文件 @
f9e7298a
...
@@ -35,11 +35,6 @@
...
@@ -35,11 +35,6 @@
<artifactId>
slf4j-api
</artifactId>
<artifactId>
slf4j-api
</artifactId>
<version>
1.7.25
</version>
<version>
1.7.25
</version>
</dependency>
</dependency>
<dependency>
<groupId>
ch.qos.logback
</groupId>
<artifactId>
logback-classic
</artifactId>
<version>
1.2.3
</version>
</dependency>
<dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<groupId>
org.slf4j
</groupId>
<artifactId>
log4j-over-slf4j
</artifactId>
<artifactId>
log4j-over-slf4j
</artifactId>
...
@@ -48,12 +43,23 @@
...
@@ -48,12 +43,23 @@
<dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-core
</artifactId>
<artifactId>
log4j-core
</artifactId>
<version>
2.
8.2
</version>
<version>
2.
9.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.google.guava
</groupId>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
<artifactId>
guava
</artifactId>
<version>
22.0
</version>
<version>
22.0
</version>
</dependency>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-slf4j-impl
</artifactId>
<version>
2.9.0
</version>
<exclusions>
<exclusion>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-core
</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencies>
</project>
</project>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录