Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
06f35826
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 搜索 >>
提交
06f35826
编写于
11月 22, 2014
作者:
N
Nicolargo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not crash if password is protected by a password
上级
fafcd176
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
12 deletion
+18
-12
glances/core/glances_client.py
glances/core/glances_client.py
+9
-3
glances/core/glances_client_browser.py
glances/core/glances_client_browser.py
+9
-9
未找到文件。
glances/core/glances_client.py
浏览文件 @
06f35826
...
...
@@ -98,7 +98,7 @@ class GlancesClient(object):
"""
return
self
.
mode
def
login
(
self
):
def
login
(
self
,
return_to_browser
=
False
):
"""Logon to the server."""
ret
=
True
...
...
@@ -120,7 +120,10 @@ class GlancesClient(object):
logger
.
error
(
"Connection to server failed (Bad password)"
)
else
:
logger
.
error
(
"Connection to server failed ({0})"
).
format
(
err
)
sys
.
exit
(
2
)
if
not
return_to_browser
:
sys
.
exit
(
2
)
else
:
return
False
if
self
.
get_mode
()
==
'glances'
and
version
[:
3
]
==
client_version
[:
3
]:
# Init stats
...
...
@@ -143,7 +146,10 @@ class GlancesClient(object):
if
not
self
.
stats
.
check_snmp
():
logger
.
error
(
"Connection to SNMP server failed"
)
sys
.
exit
(
2
)
if
not
return_to_browser
:
sys
.
exit
(
2
)
else
:
return
False
if
ret
:
# Load limits from the configuration file
...
...
glances/core/glances_client_browser.py
浏览文件 @
06f35826
...
...
@@ -91,10 +91,10 @@ class GlancesClientBrowser(object):
v
[
'hr_name'
]
=
json
.
loads
(
s
.
getSystem
())[
'hr_name'
]
except
(
socket
.
error
,
Fault
,
KeyError
)
as
e
:
logger
.
warning
(
"
Can not grab
stats form {0}: {1}"
.
format
(
uri
,
e
))
"
Error while grabbing
stats form {0}: {1}"
.
format
(
uri
,
e
))
except
ProtocolError
as
e
:
logger
.
debug
(
"
Password protected server.
Can not grab stats from {0}: {1}"
.
format
(
uri
,
e
))
"Can not grab stats from {0}: {1}"
.
format
(
uri
,
e
))
# List can change size during iteration...
except
RuntimeError
:
logger
.
debug
(
...
...
@@ -121,15 +121,15 @@ class GlancesClientBrowser(object):
args
=
args_server
)
# Test if client and server are in the same major version
if
not
client
.
login
():
if
not
client
.
login
(
return_to_browser
=
True
):
logger
.
error
(
"The server version is not compatible with the client"
)
"Can not connect to the server (incompatible version or password protection)"
)
else
:
# Start the client loop
client
.
serve_forever
(
return_to_browser
=
True
)
# Start the client loop
client
.
serve_forever
(
return_to_browser
=
True
)
logger
.
debug
(
"Disconnect Glances client from the %s server"
%
self
.
get_servers_list
()[
self
.
screen
.
get_active
()][
'key'
])
logger
.
debug
(
"Disconnect Glances client from the %s server"
%
self
.
get_servers_list
()[
self
.
screen
.
get_active
()][
'key'
])
self
.
screen
.
set_active
(
None
)
def
end
(
self
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录