Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
fa58150d
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 搜索 >>
提交
fa58150d
编写于
7月 28, 2018
作者:
N
nicolargo
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'issue1275' into develop
上级
237d22b1
4d7b798f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
6 deletion
+9
-6
NEWS
NEWS
+2
-1
glances/client_browser.py
glances/client_browser.py
+2
-2
glances/outputs/glances_curses_browser.py
glances/outputs/glances_curses_browser.py
+5
-3
未找到文件。
NEWS
浏览文件 @
fa58150d
...
...
@@ -61,7 +61,8 @@ Bugs corrected:
* Crashes when influxdb option set #1260
* AMP for kernel process is not working #1261
* Arch linux package (2.11.1-2) psutil (v5.4.1): RuntimeWarning: ignoring OSError #1203
* Glances crash with extended process stats #1283
* Glances crash with extended process stats #1283
* Terminal window stuck at the last accessed *protected* server #1275
Backward-incompatible changes:
...
...
glances/client_browser.py
浏览文件 @
fa58150d
...
...
@@ -24,11 +24,11 @@ import socket
import
threading
from
glances.compat
import
Fault
,
ProtocolError
,
ServerProxy
from
glances.autodiscover
import
GlancesAutoDiscoverServer
from
glances.client
import
GlancesClient
,
GlancesClientTransport
from
glances.logger
import
logger
,
LOG_FILENAME
from
glances.password_list
import
GlancesPasswordList
as
GlancesPassword
from
glances.static_list
import
GlancesStaticServer
from
glances.autodiscover
import
GlancesAutoDiscoverServer
from
glances.outputs.glances_curses_browser
import
GlancesCursesBrowser
...
...
@@ -151,7 +151,7 @@ class GlancesClientBrowser(object):
Connect and display the given server
"""
# Display the Glances client for the selected server
logger
.
debug
(
"Selected server
:
{}"
.
format
(
server
))
logger
.
debug
(
"Selected server {}"
.
format
(
server
))
# Connection can take time
# Display a popup
...
...
glances/outputs/glances_curses_browser.py
浏览文件 @
fa58150d
...
...
@@ -106,14 +106,16 @@ class GlancesCursesBrowser(_GlancesCurses):
sys
.
exit
(
0
)
elif
self
.
pressedkey
==
10
:
# 'ENTER' > Run Glances on the selected server
logger
.
debug
(
"Server number {} selected"
.
format
(
self
.
cursor
+
1
))
self
.
active_server
=
self
.
cursor
elif
self
.
pressedkey
==
curses
.
KEY_UP
:
logger
.
debug
(
"Server {}/{} selected"
.
format
(
self
.
cursor
+
1
,
len
(
stats
)))
elif
self
.
pressedkey
==
curses
.
KEY_UP
or
self
.
pressedkey
==
65
:
# 'UP' > Up in the server list
self
.
cursor_up
(
stats
)
elif
self
.
pressedkey
==
curses
.
KEY_DOWN
:
logger
.
debug
(
"Server {}/{} selected"
.
format
(
self
.
cursor
+
1
,
len
(
stats
)))
elif
self
.
pressedkey
==
curses
.
KEY_DOWN
or
self
.
pressedkey
==
66
:
# 'DOWN' > Down in the server list
self
.
cursor_down
(
stats
)
logger
.
debug
(
"Server {}/{} selected"
.
format
(
self
.
cursor
+
1
,
len
(
stats
)))
# Return the key code
return
self
.
pressedkey
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录