Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
7cf67ffa
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
提交
7cf67ffa
编写于
5月 30, 2018
作者:
X
Xin,Zhang
提交者:
wu-sheng
5月 30, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support the Chinese in config properties (#1288)
上级
b8dcf269
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
3 deletion
+32
-3
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigReadFailedException.java
...alking/apm/agent/core/conf/ConfigReadFailedException.java
+25
-0
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
...walking/apm/agent/core/conf/SnifferConfigInitializer.java
+7
-3
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigReadFailedException.java
0 → 100644
浏览文件 @
7cf67ffa
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.agent.core.conf
;
public
class
ConfigReadFailedException
extends
Exception
{
public
ConfigReadFailedException
(
String
message
,
Throwable
parent
)
{
super
(
message
,
parent
);
}
}
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
浏览文件 @
7cf67ffa
...
...
@@ -22,6 +22,8 @@ import java.io.File;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
import
java.io.InputStream
;
import
java.io.InputStreamReader
;
import
java.io.UnsupportedEncodingException
;
import
java.util.Iterator
;
import
java.util.Map
;
import
java.util.Properties
;
...
...
@@ -53,7 +55,7 @@ public class SnifferConfigInitializer {
* At the end, `agent.application_code` and `collector.servers` must be not blank.
*/
public
static
void
initialize
()
throws
ConfigNotFoundException
,
AgentPackageNotFoundException
{
InputStream
configFileStream
;
InputStream
Reader
configFileStream
;
try
{
configFileStream
=
loadConfigFromAgentFolder
();
...
...
@@ -115,15 +117,17 @@ public class SnifferConfigInitializer {
*
* @return the config file {@link InputStream}, or null if not needEnhance.
*/
private
static
InputStream
loadConfigFromAgentFolder
()
throws
AgentPackageNotFoundException
,
ConfigNotFoun
dException
{
private
static
InputStream
Reader
loadConfigFromAgentFolder
()
throws
AgentPackageNotFoundException
,
ConfigNotFoundException
,
ConfigReadFaile
dException
{
File
configFile
=
new
File
(
AgentPackagePath
.
getPath
(),
CONFIG_FILE_NAME
);
if
(
configFile
.
exists
()
&&
configFile
.
isFile
())
{
try
{
logger
.
info
(
"Config file found in {}."
,
configFile
);
return
new
FileInputStream
(
configFile
);
return
new
InputStreamReader
(
new
FileInputStream
(
configFile
),
"UTF-8"
);
}
catch
(
FileNotFoundException
e
)
{
throw
new
ConfigNotFoundException
(
"Fail to load agent.config"
,
e
);
}
catch
(
UnsupportedEncodingException
e
)
{
throw
new
ConfigReadFailedException
(
"Fail to load agent.config"
,
e
);
}
}
throw
new
ConfigNotFoundException
(
"Fail to load agent config file."
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录