Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
d3c12058
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,发现更多精彩内容 >>
提交
d3c12058
编写于
8月 09, 2013
作者:
N
Nicolas Hennion
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Enhance monitored process log message
上级
9c3f219f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
23 addition
and
3 deletion
+23
-3
glances/conf/glances-with-monitored.conf
glances/conf/glances-with-monitored.conf
+1
-0
glances/glances.py
glances/glances.py
+22
-3
未找到文件。
glances/conf/glances-with-monitored.conf
浏览文件 @
d3c12058
...
...
@@ -100,3 +100,4 @@ list_2_description=Python programs
list_2_regex
=.*
python
.*
list_3_description
=
Famous
Xeyes
list_3_regex
=.*
xeyes
.*
list_3_countmax
=
1
glances/glances.py
浏览文件 @
d3c12058
...
...
@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
__appname__
=
'glances'
__version__
=
"1.7RC
4
"
__version__
=
"1.7RC
5
"
__author__
=
"Nicolas Hennion <nicolas@nicolargo.com>"
__licence__
=
"LGPL"
...
...
@@ -687,17 +687,26 @@ class glancesLogs:
"""
# Add Top process sort depending on alert type
sortby
=
'none'
if
item_type
.
startswith
(
"MEM"
):
# Sort TOP process by memory_percent
sortby
=
'memory_percent'
elif
item_type
.
startswith
(
"CPU IO"
)
and
is_Linux
:
# Sort TOP process by io_counters (only for Linux OS)
sortby
=
'io_counters'
elif
item_type
.
startswith
(
"MON"
):
# Do no sort process for monitored prcesses list
sortby
=
'none'
else
:
# Default TOP process sort is cpu_percent
sortby
=
'cpu_percent'
# Sort processes
if
(
sortby
!=
'none'
):
topprocess
=
sorted
(
proc_list
,
key
=
lambda
process
:
process
[
sortby
],
reverse
=
True
)
else
:
topprocess
=
proc_list
# Add or update the log
item_index
=
self
.
__itemexist__
(
item_type
)
...
...
@@ -2977,11 +2986,21 @@ class glancesScreen:
logmark
=
'~'
logmsg
+=
" > "
+
"%19s"
%
"___________________"
if
log
[
logcount
][
3
][:
3
]
==
"MEM"
:
# Special display for MEMORY
logmsg
+=
" {0} ({1}/{2}/{3})"
.
format
(
log
[
logcount
][
3
],
self
.
__autoUnit
(
log
[
logcount
][
6
]),
self
.
__autoUnit
(
log
[
logcount
][
5
]),
self
.
__autoUnit
(
log
[
logcount
][
4
]))
elif
log
[
logcount
][
3
][:
3
]
==
"MON"
:
# Special display for monitored pocesses list
if
(
log
[
logcount
][
5
]
==
0
):
logmsg
+=
" No running process"
elif
(
log
[
logcount
][
5
]
==
1
):
logmsg
+=
" One running process"
else
:
logmsg
+=
" {0} running processes"
.
format
(
self
.
__autoUnit
(
log
[
logcount
][
5
]))
else
:
logmsg
+=
" {0} ({1:.1f}/{2:.1f}/{3:.1f})"
.
format
(
log
[
logcount
][
3
],
log
[
logcount
][
6
],
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录