Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
fcc65bf1
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,体验更适合开发者的 AI 搜索 >>
提交
fcc65bf1
编写于
3月 06, 2016
作者:
A
Alessio Sergi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix highlighting of process when it contains whitespaces (issue #546)
上级
c9f453fd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
12 deletion
+11
-12
glances/plugins/glances_processlist.py
glances/plugins/glances_processlist.py
+10
-10
glances/processes.py
glances/processes.py
+1
-2
未找到文件。
glances/plugins/glances_processlist.py
浏览文件 @
fcc65bf1
...
...
@@ -290,22 +290,22 @@ class Plugin(GlancesPlugin):
# If no command line for the process is available, fallback to
# the bare process name instead
cmdline
=
p
[
'cmdline'
]
argument
=
' '
.
join
(
cmdline
.
split
()[
1
:])
try
:
if
cmdline
==
''
:
msg
=
' {0}'
.
format
(
p
[
'name'
])
ret
.
append
(
self
.
curse_add_line
(
msg
,
splittable
=
True
))
else
:
cmd
=
cmdline
.
split
()[
0
]
path
,
basename
=
os
.
path
.
split
(
cmd
)
# XXX: remove `cmdline != ['']` when we'll drop support for psutil<4.0.0
if
cmdline
and
cmdline
!=
[
''
]:
path
,
cmd
=
os
.
path
.
split
(
cmdline
[
0
])
if
os
.
path
.
isdir
(
path
)
and
not
args
.
process_short_name
:
msg
=
' {0}'
.
format
(
path
)
+
os
.
sep
ret
.
append
(
self
.
curse_add_line
(
msg
,
splittable
=
True
))
ret
.
append
(
self
.
curse_add_line
(
basename
,
decoration
=
'PROCESS'
,
splittable
=
True
))
ret
.
append
(
self
.
curse_add_line
(
cmd
,
decoration
=
'PROCESS'
,
splittable
=
True
))
else
:
msg
=
' {0}'
.
format
(
basename
)
msg
=
' {0}'
.
format
(
cmd
)
ret
.
append
(
self
.
curse_add_line
(
msg
,
decoration
=
'PROCESS'
,
splittable
=
True
))
msg
=
' {0}'
.
format
(
argument
)
arguments
=
' '
.
join
(
cmdline
[
1
:]).
replace
(
'
\n
'
,
' '
)
msg
=
' {0}'
.
format
(
arguments
)
ret
.
append
(
self
.
curse_add_line
(
msg
,
splittable
=
True
))
else
:
msg
=
' {0}'
.
format
(
p
[
'name'
])
ret
.
append
(
self
.
curse_add_line
(
msg
,
splittable
=
True
))
except
UnicodeEncodeError
:
ret
.
append
(
self
.
curse_add_line
(
''
,
splittable
=
True
))
...
...
glances/processes.py
浏览文件 @
fcc65bf1
...
...
@@ -392,8 +392,7 @@ class GlancesProcesses(object):
except
KeyError
:
# Patch for issue #391
try
:
self
.
cmdline_cache
[
procstat
[
'pid'
]]
=
' '
.
join
(
proc
.
cmdline
())
self
.
cmdline_cache
[
procstat
[
'pid'
]]
=
proc
.
cmdline
()
except
(
AttributeError
,
UnicodeDecodeError
,
psutil
.
AccessDenied
,
psutil
.
NoSuchProcess
):
self
.
cmdline_cache
[
procstat
[
'pid'
]]
=
""
procstat
[
'cmdline'
]
=
self
.
cmdline_cache
[
procstat
[
'pid'
]]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录