Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
372d3faf
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 搜索 >>
提交
372d3faf
编写于
9月 09, 2017
作者:
N
nicolargo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Client and Quiet mode don't work together (issue #1139)
上级
042c1460
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
6 deletion
+19
-6
NEWS
NEWS
+2
-1
glances/client.py
glances/client.py
+17
-5
未找到文件。
NEWS
浏览文件 @
372d3faf
...
@@ -5,7 +5,8 @@ Glances Version 2
...
@@ -5,7 +5,8 @@ Glances Version 2
Version 2.11.1
Version 2.11.1
==============
==============
* ...
* [WebUI] Sensors not showing on Web (issue #1142)
* Client and Quiet mode don't work together (issue #1139)
Version 2.11
Version 2.11
============
============
...
...
glances/client.py
浏览文件 @
372d3faf
...
@@ -46,6 +46,8 @@ class GlancesClient(object):
...
@@ -46,6 +46,8 @@ class GlancesClient(object):
# Store the arg/config
# Store the arg/config
self
.
args
=
args
self
.
args
=
args
self
.
config
=
config
self
.
config
=
config
# Quiet mode
self
.
_quiet
=
args
.
quiet
# Default client mode
# Default client mode
self
.
_client_mode
=
'glances'
self
.
_client_mode
=
'glances'
...
@@ -70,6 +72,10 @@ class GlancesClient(object):
...
@@ -70,6 +72,10 @@ class GlancesClient(object):
except
Exception
as
e
:
except
Exception
as
e
:
self
.
log_and_exit
(
"Client couldn't create socket {}: {}"
.
format
(
self
.
uri
,
e
))
self
.
log_and_exit
(
"Client couldn't create socket {}: {}"
.
format
(
self
.
uri
,
e
))
@
property
def
quiet
(
self
):
return
self
.
_quiet
def
log_and_exit
(
self
,
msg
=
''
):
def
log_and_exit
(
self
,
msg
=
''
):
"""Log and exit."""
"""Log and exit."""
if
not
self
.
return_to_browser
:
if
not
self
.
return_to_browser
:
...
@@ -167,7 +173,11 @@ class GlancesClient(object):
...
@@ -167,7 +173,11 @@ class GlancesClient(object):
self
.
stats
.
load_limits
(
self
.
config
)
self
.
stats
.
load_limits
(
self
.
config
)
# Init screen
# Init screen
self
.
screen
=
GlancesCursesClient
(
config
=
self
.
config
,
args
=
self
.
args
)
if
self
.
quiet
:
# In quiet mode, nothing is displayed
logger
.
info
(
"Quiet mode is ON: Nothing will be displayed"
)
else
:
self
.
screen
=
GlancesCursesClient
(
config
=
self
.
config
,
args
=
self
.
args
)
# Return True: OK
# Return True: OK
return
True
return
True
...
@@ -237,9 +247,10 @@ class GlancesClient(object):
...
@@ -237,9 +247,10 @@ class GlancesClient(object):
cs_status
=
self
.
update
()
cs_status
=
self
.
update
()
# Update the screen
# Update the screen
exitkey
=
self
.
screen
.
update
(
self
.
stats
,
if
not
self
.
quiet
:
cs_status
=
cs_status
,
exitkey
=
self
.
screen
.
update
(
self
.
stats
,
return_to_browser
=
self
.
return_to_browser
)
cs_status
=
cs_status
,
return_to_browser
=
self
.
return_to_browser
)
# Export stats using export modules
# Export stats using export modules
self
.
stats
.
export
(
self
.
stats
)
self
.
stats
.
export
(
self
.
stats
)
...
@@ -251,4 +262,5 @@ class GlancesClient(object):
...
@@ -251,4 +262,5 @@ class GlancesClient(object):
def
end
(
self
):
def
end
(
self
):
"""End of the client session."""
"""End of the client session."""
self
.
screen
.
end
()
if
not
self
.
quiet
:
self
.
screen
.
end
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录