Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
1ad9a146
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1ad9a146
编写于
7月 31, 2014
作者:
J
jialinsun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix cat-agent bug of runing process open too many files
上级
55d17ce8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
15 deletion
+22
-15
cat-agent/src/main/java/com/dianping/cat/agent/monitor/CommandUtils.java
...ain/java/com/dianping/cat/agent/monitor/CommandUtils.java
+19
-12
cat-agent/src/main/java/com/dianping/cat/agent/monitor/paas/DataBuilder.java
...java/com/dianping/cat/agent/monitor/paas/DataBuilder.java
+3
-3
未找到文件。
cat-agent/src/main/java/com/dianping/cat/agent/monitor/CommandUtils.java
浏览文件 @
1ad9a146
package
com.dianping.cat.agent.monitor
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.io.InputStreamReader
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -12,26 +11,34 @@ public class CommandUtils {
public
List
<
String
>
runShell
(
String
cmd
)
throws
Exception
{
List
<
String
>
result
=
new
LinkedList
<
String
>();
BufferedReader
reader
=
null
;
InputStreamReader
sReader
=
null
;
BufferedReader
bReader
=
null
;
Process
process
=
null
;
try
{
Process
process
=
Runtime
.
getRuntime
().
exec
(
new
String
[]
{
"/bin/sh"
,
"-c"
,
cmd
});
reader
=
new
BufferedReader
(
new
InputStreamReader
(
process
.
getInputStream
()));
process
=
Runtime
.
getRuntime
().
exec
(
new
String
[]
{
"/bin/sh"
,
"-c"
,
cmd
});
sReader
=
new
InputStreamReader
(
process
.
getInputStream
());
bReader
=
new
BufferedReader
(
sReader
);
String
line
=
null
;
while
((
line
=
r
eader
.
readLine
())
!=
null
&&
StringUtils
.
isNotEmpty
(
line
))
{
while
((
line
=
bR
eader
.
readLine
())
!=
null
&&
StringUtils
.
isNotEmpty
(
line
))
{
result
.
add
(
line
);
}
}
catch
(
Exception
e
)
{
throw
new
Exception
(
e
)
;
throw
e
;
}
finally
{
if
(
reader
!=
null
)
{
try
{
reader
.
close
();
}
catch
(
IOException
e
)
{
throw
new
Exception
(
e
);
try
{
if
(
sReader
!=
null
)
{
sReader
.
close
();
}
if
(
bReader
!=
null
)
{
bReader
.
close
();
}
if
(
process
!=
null
)
{
process
.
destroy
();
}
}
catch
(
Exception
e
)
{
throw
e
;
}
}
return
result
;
...
...
cat-agent/src/main/java/com/dianping/cat/agent/monitor/paas/DataBuilder.java
浏览文件 @
1ad9a146
...
...
@@ -152,11 +152,11 @@ public class DataBuilder {
try
{
outputs
=
m_commandUtils
.
runShell
(
cmd
);
return
convert2DataEntities
(
outputs
);
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
}
List
<
DataEntity
>
dataEntities
=
convert2DataEntities
(
outputs
);
return
dataEntities
;
return
new
ArrayList
<
DataEntity
>();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录