Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
b55f9ab7
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
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,发现更多精彩内容 >>
提交
b55f9ab7
编写于
9月 27, 2017
作者:
wu-sheng
提交者:
GitHub
9月 27, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into fixed/438
上级
224ef659
ea8d4a7d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
8 deletion
+13
-8
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
...walking/apm/agent/core/conf/SnifferConfigInitializer.java
+13
-8
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
浏览文件 @
b55f9ab7
...
...
@@ -44,7 +44,7 @@ public class SnifferConfigInitializer {
configFileStream
=
SnifferConfigInitializer
.
class
.
getResourceAsStream
(
CONFIG_FILE_NAME
);
if
(
configFileStream
==
null
)
{
logger
.
info
(
"No
{} file found in class path."
,
CONFIG_FILE_NAME
);
logger
.
info
(
"No
config file found, according system property '-Dconfig'."
);
configFileStream
=
loadConfigFromAgentFolder
();
}
else
{
logger
.
info
(
"{} file found in class path."
,
CONFIG_FILE_NAME
);
...
...
@@ -81,26 +81,31 @@ public class SnifferConfigInitializer {
}
/**
* Load the config file by the path, which is provided by system property, usually with a "-Dconfig
Path
=" arg.
* Load the config file by the path, which is provided by system property, usually with a "-Dconfig=" arg.
*
* @return the config file {@link InputStream}, or null if not needEnhance.
*/
private
static
InputStream
loadConfigBySystemProperty
()
{
String
config
Path
=
System
.
getProperty
(
"configPath
"
);
if
(
StringUtil
.
isEmpty
(
config
Path
))
{
String
config
=
System
.
getProperty
(
"config
"
);
if
(
StringUtil
.
isEmpty
(
config
))
{
return
null
;
}
File
configFile
=
new
File
(
configPath
,
CONFIG_FILE_NAME
);
File
configFile
=
new
File
(
config
);
if
(
configFile
.
exists
()
&&
configFile
.
isDirectory
())
{
logger
.
info
(
"check {} in path {}, according system property."
,
CONFIG_FILE_NAME
,
config
);
configFile
=
new
File
(
config
,
CONFIG_FILE_NAME
);
}
if
(
configFile
.
exists
()
&&
configFile
.
isFile
())
{
try
{
logger
.
info
(
"
{} found in path {}, according system property."
,
CONFIG_FILE_NAME
,
configPath
);
logger
.
info
(
"
found {}, according system property."
,
configFile
.
getAbsolutePath
()
);
return
new
FileInputStream
(
configFile
);
}
catch
(
FileNotFoundException
e
)
{
logger
.
error
(
e
,
"Fail to load {}
in path {}, according system property."
,
CONFIG_FILE_NAME
,
configPath
);
logger
.
error
(
e
,
"Fail to load {}
, according system property."
,
config
);
}
}
logger
.
info
(
"No {}
found in path {}, according system property."
,
CONFIG_FILE_NAME
,
configPath
);
logger
.
info
(
"No {}
found, according system property."
,
config
);
return
null
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录