Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
cf72037f
S
SkyWalking
项目概览
javalover123888
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
2
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
cf72037f
编写于
12月 22, 2017
作者:
wu-sheng
提交者:
GitHub
12月 22, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #697 from apache/fix/log-file-bug
Make sure the log config works.
上级
3cf0a593
59371b1f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
8 deletion
+15
-8
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
...walking/apm/agent/core/conf/SnifferConfigInitializer.java
+13
-7
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java
...skywalking/apm/agent/core/logging/core/WriterFactory.java
+2
-1
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
浏览文件 @
cf72037f
...
...
@@ -19,13 +19,6 @@
package
org.apache.skywalking.apm.agent.core.conf
;
import
org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException
;
import
org.apache.skywalking.apm.agent.core.boot.AgentPackagePath
;
import
org.apache.skywalking.apm.agent.core.logging.api.ILog
;
import
org.apache.skywalking.apm.agent.core.logging.api.LogManager
;
import
org.apache.skywalking.apm.util.ConfigInitializer
;
import
org.apache.skywalking.apm.util.StringUtil
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
...
...
@@ -33,6 +26,12 @@ import java.io.InputStream;
import
java.util.Iterator
;
import
java.util.Map
;
import
java.util.Properties
;
import
org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException
;
import
org.apache.skywalking.apm.agent.core.boot.AgentPackagePath
;
import
org.apache.skywalking.apm.agent.core.logging.api.ILog
;
import
org.apache.skywalking.apm.agent.core.logging.api.LogManager
;
import
org.apache.skywalking.apm.util.ConfigInitializer
;
import
org.apache.skywalking.apm.util.StringUtil
;
/**
* The <code>SnifferConfigInitializer</code> initializes all configs in several way.
...
...
@@ -44,6 +43,7 @@ public class SnifferConfigInitializer {
private
static
final
ILog
logger
=
LogManager
.
getLogger
(
SnifferConfigInitializer
.
class
);
private
static
String
CONFIG_FILE_NAME
=
"/config/agent.config"
;
private
static
String
ENV_KEY_PREFIX
=
"skywalking."
;
private
static
boolean
IS_INIT_COMPLETED
=
false
;
/**
* Try to locate `agent.config`, which should be in the /config dictionary of agent package.
...
...
@@ -78,6 +78,12 @@ public class SnifferConfigInitializer {
if
(
StringUtil
.
isEmpty
(
Config
.
Collector
.
SERVERS
))
{
throw
new
ExceptionInInitializerError
(
"`collector.servers` is missing."
);
}
IS_INIT_COMPLETED
=
true
;
}
public
static
boolean
isInitCompleted
()
{
return
IS_INIT_COMPLETED
;
}
/**
...
...
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java
浏览文件 @
cf72037f
...
...
@@ -22,11 +22,12 @@ package org.apache.skywalking.apm.agent.core.logging.core;
import
org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException
;
import
org.apache.skywalking.apm.agent.core.boot.AgentPackagePath
;
import
org.apache.skywalking.apm.agent.core.conf.Config
;
import
org.apache.skywalking.apm.agent.core.conf.SnifferConfigInitializer
;
import
org.apache.skywalking.apm.util.StringUtil
;
public
class
WriterFactory
{
public
static
IWriter
getLogWriter
()
{
if
(
AgentPackagePath
.
isPathFound
())
{
if
(
SnifferConfigInitializer
.
isInitCompleted
()
&&
AgentPackagePath
.
isPathFound
())
{
if
(
StringUtil
.
isEmpty
(
Config
.
Logging
.
DIR
))
{
try
{
Config
.
Logging
.
DIR
=
AgentPackagePath
.
getPath
()
+
"/logs"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录