2
0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 01:22:00 +00:00

Disambiguate console from shell buffer

There is room for the console replay to get confused,
fix by fully qualifying the console name.
This commit is contained in:
Jarrod Johnson 2022-02-18 17:31:13 -05:00
parent 80293efe57
commit 8fab8238ed

View File

@ -190,12 +190,13 @@ class ConsoleHandler(object):
if self.pendingbytes is not None:
self.pendingbytes += data
self.pendingbytes = b''
nodeid = self._plugin_path.format(self.node)
try:
send_output(self.node, data)
send_output(nodeid, data)
data = self.pendingbytes
self.pendingbytes = None
if data:
send_output(self.node, data)
send_output(nodeid, data)
except Exception:
_tracelog.log(traceback.format_exc(), ltype=log.DataTypes.event,
event=log.Events.stacktrace)
@ -547,7 +548,8 @@ class ConsoleHandler(object):
'connectstate': self.connectstate,
'clientcount': len(self.livesessions),
}
retdata = get_buffer_output(self.node)
nodeid = self._plugin_path.format(self.node)
retdata = get_buffer_output(nodeid)
return retdata, connstate
def write(self, data):