提交 4d7b798f 编写于 作者: N nicolargo

Terminal window stuck at the last accessed *protected* server #1275

上级 237d22b1
...@@ -61,7 +61,8 @@ Bugs corrected: ...@@ -61,7 +61,8 @@ Bugs corrected:
* Crashes when influxdb option set #1260 * Crashes when influxdb option set #1260
* AMP for kernel process is not working #1261 * AMP for kernel process is not working #1261
* Arch linux package (2.11.1-2) psutil (v5.4.1): RuntimeWarning: ignoring OSError #1203 * 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: Backward-incompatible changes:
......
...@@ -24,11 +24,11 @@ import socket ...@@ -24,11 +24,11 @@ import socket
import threading import threading
from glances.compat import Fault, ProtocolError, ServerProxy from glances.compat import Fault, ProtocolError, ServerProxy
from glances.autodiscover import GlancesAutoDiscoverServer
from glances.client import GlancesClient, GlancesClientTransport from glances.client import GlancesClient, GlancesClientTransport
from glances.logger import logger, LOG_FILENAME from glances.logger import logger, LOG_FILENAME
from glances.password_list import GlancesPasswordList as GlancesPassword from glances.password_list import GlancesPasswordList as GlancesPassword
from glances.static_list import GlancesStaticServer from glances.static_list import GlancesStaticServer
from glances.autodiscover import GlancesAutoDiscoverServer
from glances.outputs.glances_curses_browser import GlancesCursesBrowser from glances.outputs.glances_curses_browser import GlancesCursesBrowser
...@@ -151,7 +151,7 @@ class GlancesClientBrowser(object): ...@@ -151,7 +151,7 @@ class GlancesClientBrowser(object):
Connect and display the given server Connect and display the given server
""" """
# Display the Glances client for the selected 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 # Connection can take time
# Display a popup # Display a popup
......
...@@ -106,14 +106,16 @@ class GlancesCursesBrowser(_GlancesCurses): ...@@ -106,14 +106,16 @@ class GlancesCursesBrowser(_GlancesCurses):
sys.exit(0) sys.exit(0)
elif self.pressedkey == 10: elif self.pressedkey == 10:
# 'ENTER' > Run Glances on the selected server # 'ENTER' > Run Glances on the selected server
logger.debug("Server number {} selected".format(self.cursor + 1))
self.active_server = self.cursor 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 # 'UP' > Up in the server list
self.cursor_up(stats) 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 # 'DOWN' > Down in the server list
self.cursor_down(stats) self.cursor_down(stats)
logger.debug("Server {}/{} selected".format(self.cursor + 1, len(stats)))
# Return the key code # Return the key code
return self.pressedkey return self.pressedkey
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册