2
0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-19 12:05:13 +00:00

Fix remote collective console

The changes to support size data for ssh was not carried fully
through the proxyconsole object.  Fix this support.
This commit is contained in:
Jarrod Johnson 2019-01-09 11:34:19 -05:00
parent 334ec00f3f
commit ceba3ff34f

View File

@ -653,8 +653,10 @@ def connect_node(node, configmanager, username=None, direct=True, width=80,
class ProxyConsole(object):
_genwatchattribs = frozenset(('collective.manager',))
def __init__(self, node, managerinfo, myname, configmanager, user):
def __init__(self, node, managerinfo, myname, configmanager, user, width,
height):
self.skipreplay = True
self.initsize = (width, height)
self.managerinfo = managerinfo
self.myname = myname
self.cfm = configmanager
@ -665,6 +667,7 @@ class ProxyConsole(object):
self._attribwatcher = configmanager.watch_attributes(
(self.node,), self._genwatchattribs, self._attribschanged)
def _attribschanged(self, nodeattribs, configmanager, **kwargs):
if self.clisession:
self.clisession.detach()
@ -706,6 +709,8 @@ class ProxyConsole(object):
'tenant': self.cfm.tenant,
'node': self.node,
'skipreplay': self.skipreplay,
'width': self.initsize[0],
'height': self.initsize[1],
#TODO(jjohnson2): declare myself as a proxy,
#facilitate redirect rather than relay on manager change
},