Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
avocado
提交
39069684
A
avocado
项目概览
openeuler
/
avocado
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
avocado
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
39069684
编写于
9月 06, 2016
作者:
C
Cleber Rosa
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'apahim/sysinfo_fails_silently_v2'
上级
cb83551f
116737c5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
15 deletion
+26
-15
avocado/core/sysinfo.py
avocado/core/sysinfo.py
+26
-15
未找到文件。
avocado/core/sysinfo.py
浏览文件 @
39069684
...
...
@@ -335,15 +335,24 @@ class SysInfo(object):
'commands'
,
key_type
=
'path'
,
default
=
''
)
log
.
info
(
'Commands configured by file: %s'
,
commands_file
)
self
.
commands
=
genio
.
read_all_lines
(
commands_file
)
if
os
.
path
.
isfile
(
commands_file
):
log
.
info
(
'Commands configured by file: %s'
,
commands_file
)
self
.
commands
=
genio
.
read_all_lines
(
commands_file
)
else
:
log
.
debug
(
'File %s does not exist.'
,
commands_file
)
self
.
commands
=
[]
files_file
=
settings
.
get_value
(
'sysinfo.collectibles'
,
'files'
,
key_type
=
'path'
,
default
=
''
)
log
.
info
(
'Files configured by file: %s'
,
files_file
)
self
.
files
=
genio
.
read_all_lines
(
files_file
)
if
os
.
path
.
isfile
(
files_file
):
log
.
info
(
'Files configured by file: %s'
,
files_file
)
self
.
files
=
genio
.
read_all_lines
(
files_file
)
else
:
log
.
debug
(
'File %s does not exist.'
,
files_file
)
self
.
files
=
[]
if
profiler
is
None
:
self
.
profiler
=
settings
.
get_value
(
'sysinfo.collect'
,
...
...
@@ -357,18 +366,20 @@ class SysInfo(object):
'profilers'
,
key_type
=
'path'
,
default
=
''
)
self
.
profilers
=
genio
.
read_all_lines
(
profiler_file
)
log
.
info
(
'Profilers configured by file: %s'
,
profiler_file
)
log
.
info
(
'Profilers declared: %s'
,
self
.
profilers
)
if
not
self
.
profilers
:
self
.
profiler
=
False
if
self
.
profiler
is
False
:
if
os
.
path
.
isfile
(
profiler_file
):
self
.
profilers
=
genio
.
read_all_lines
(
profiler_file
)
log
.
info
(
'Profilers configured by file: %s'
,
profiler_file
)
if
not
self
.
profilers
:
log
.
info
(
'Profiler disabled: no profiler commands configured'
)
else
:
log
.
info
(
'Profiler disabled'
)
self
.
profiler
=
False
if
self
.
profiler
is
False
:
if
not
self
.
profilers
:
log
.
info
(
'Profiler disabled: no profiler commands configured'
)
else
:
log
.
info
(
'Profiler disabled'
)
else
:
log
.
debug
(
'File %s does not exist.'
,
profiler_file
)
self
.
profilers
=
[]
self
.
start_job_collectibles
=
set
()
self
.
end_job_collectibles
=
set
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录