Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
d92bcded
G
glances
项目概览
蜕变的菜鸟
/
glances
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glances
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
d92bcded
编写于
6月 06, 2018
作者:
N
Nicolas Hennion
提交者:
GitHub
6月 06, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1269 from notFloran/webui-empty-values
Handle empty values in the webUI
上级
6d421e3d
8e170e4c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
31 addition
and
9 deletion
+31
-9
glances/outputs/static/js/components/plugin-processlist/controller.js
...uts/static/js/components/plugin-processlist/controller.js
+26
-4
glances/outputs/static/js/components/plugin-processlist/view.html
...outputs/static/js/components/plugin-processlist/view.html
+5
-5
glances/outputs/static/public/glances.js
glances/outputs/static/public/glances.js
+0
-0
glances/outputs/static/public/glances.map.js
glances/outputs/static/public/glances.map.js
+0
-0
未找到文件。
glances/outputs/static/js/components/plugin-processlist/controller.js
浏览文件 @
d92bcded
...
...
@@ -22,10 +22,32 @@ export default function GlancesPluginProcesslistController($scope, GlancesStats,
for
(
var
i
=
0
;
i
<
processlistStats
.
length
;
i
++
)
{
var
process
=
processlistStats
[
i
];
process
.
memvirt
=
process
.
memory_info
[
1
];
process
.
memres
=
process
.
memory_info
[
0
];
process
.
timeplus
=
$filter
(
'
timedelta
'
)(
process
.
cpu_times
);
process
.
timemillis
=
$filter
(
'
timemillis
'
)(
process
.
cpu_times
);
process
.
memvirt
=
"
?
"
;
process
.
memres
=
"
?
"
;
if
(
process
.
memory_info
)
{
process
.
memvirt
=
process
.
memory_info
[
1
];
process
.
memres
=
process
.
memory_info
[
0
];
}
process
.
timeplus
=
"
?
"
;
process
.
timemillis
=
"
?
"
;
if
(
process
.
cpu_times
)
{
process
.
timeplus
=
$filter
(
'
timedelta
'
)(
process
.
cpu_times
);
process
.
timemillis
=
$filter
(
'
timemillis
'
)(
process
.
cpu_times
);
}
if
(
process
.
num_threads
===
null
)
{
process
.
num_threads
=
-
1
;
}
if
(
process
.
cpu_percent
===
null
)
{
process
.
cpu_percent
=
-
1
;
}
if
(
process
.
memory_percent
===
null
)
{
process
.
memory_percent
=
-
1
;
}
process
.
ioRead
=
null
;
process
.
ioWrite
=
null
;
...
...
glances/outputs/static/js/components/plugin-processlist/view.html
浏览文件 @
d92bcded
...
...
@@ -17,19 +17,19 @@
</div>
<div
class=
"table-row"
ng-repeat=
"process in vm.processes | orderBy:vm.sorter.column:vm.sorter.isReverseColumn(vm.sorter.column) | limitTo: vm.getLimit() track by process.pid"
>
<div
class=
"table-cell"
ng-class=
"vm.getCpuPercentAlert(process)"
>
{{process.cpu_percent | number:1}}
</div>
<div
class=
"table-cell"
ng-class=
"vm.getMemoryPercentAlert(process)"
>
{{process.memory_percent | number:1}}
</div>
<div
class=
"table-cell"
ng-class=
"vm.getCpuPercentAlert(process)"
>
{{ process.cpu_percent == -1 ? '?' : (process.cpu_percent | number:1) }}
</div>
<div
class=
"table-cell"
ng-class=
"vm.getMemoryPercentAlert(process)"
>
{{ process.memory_percent == -1 ? '?' : (process.memory_percent | number:1) }}
</div>
<div
class=
"table-cell hidden-xs hidden-sm"
>
{{process.memvirt | bytes}}
</div>
<div
class=
"table-cell hidden-xs hidden-sm"
>
{{process.memres | bytes}}
</div>
<div
class=
"table-cell"
>
{{process.pid}}
</div>
<div
class=
"table-cell text-left"
>
{{process.username}}
</div>
<div
class=
"table-cell hidden-xs hidden-sm"
>
<div
class=
"table-cell hidden-xs hidden-sm"
ng-if=
"process.timeplus != '?'"
>
<span
ng-show=
"process.timeplus.hours > 0"
class=
"highlight"
>
{{ process.timeplus.hours }}h
</span>
{{
process.timeplus.minutes | leftPad:2:'0' }}:{{ process.timeplus.seconds | leftPad:2:'0' }}
<span
ng-show=
"process.timeplus.hours <= 0"
>
.{{ process.timeplus.milliseconds | leftPad:2:'0' }}
</span>
</div>
<div
class=
"table-cell text-left hidden-xs hidden-sm"
>
{{process.num_threads}}
</div>
<div
class=
"table-cell hidden-xs hidden-sm"
ng-if=
"process.timeplus == '?'"
>
?
</div>
<div
class=
"table-cell text-left hidden-xs hidden-sm"
>
{{ process.num_threads == -1 ? '?' : process.num_threads }}
</div>
<div
class=
"table-cell"
ng-class=
"{nice: process.isNice}"
>
{{process.nice | exclamation}}
</div>
<div
class=
"table-cell"
ng-class=
"{status: process.status == 'R'}"
>
{{process.status}}
</div>
<div
class=
"table-cell hidden-xs hidden-sm"
ng-show=
"vm.ioReadWritePresent"
>
{{process.ioRead}}
</div>
...
...
glances/outputs/static/public/glances.js
浏览文件 @
d92bcded
此差异由.gitattributes 抑制。
glances/outputs/static/public/glances.map.js
浏览文件 @
d92bcded
此差异由.gitattributes 抑制。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录