xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 03:19:48 +00:00
Code Issues Projects Releases Wiki Activity

Key console session objects by tenant and node

Browse Source 
Previously, was just keying by node.  The problem of course being that
the first tenant to connect for a given node name dictates the console
object for everyone else.  Correct this by keying by the tuple of tenant and node together.
This commit is contained in:
Jarrod Johnson 2014-02-07 18:59:32 -05:00
parent 3dc0128e73
commit 2f62e9e6bb
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
confluent/consoleserver.py
View File

@ -122,24 +122,27 @@ class ConsoleSession(object):
"""
def __init__(self, node, configmanager, datacallback=None):
if node not in _handled_consoles:
_handled_consoles[node] = _ConsoleHandler(node, configmanager)
self.tenant = configmanager.tenant
consk = (node, self.tenant)
self.ckey = consk
if consk not in _handled_consoles:
_handled_consoles[consk] = _ConsoleHandler(node, configmanager)
self._evt = threading.Event()
self.node = node
self.conshdl = _handled_consoles[node]
self.write = _handled_consoles[node].write
self.conshdl = _handled_consoles[consk]
self.write = _handled_consoles[consk].write
if datacallback is None:
self.reaper = eventlet.spawn_after(15, self.destroy)
self.databuffer = _handled_consoles[node].get_recent()
self.reghdl = _handled_consoles[node].register_rcpt(self.got_data)
self.databuffer = _handled_consoles[consk].get_recent()
self.reghdl = _handled_consoles[consk].register_rcpt(self.got_data)
else:
self.reghdl = _handled_consoles[node].register_rcpt(datacallback)
recdata = _handled_consoles[node].get_recent()
self.reghdl = _handled_consoles[consk].register_rcpt(datacallback)
recdata = _handled_consoles[consk].get_recent()
if recdata:
datacallback(recdata)
def destroy(self):
_handled_consoles[self.node].unregister_rcpt(self.reghdl)
_handled_consoles[self.ckey].unregister_rcpt(self.reghdl)
self.databuffer = None
self._evt = None
self.reghdl = None