From 8fab8238ed01fcf921f48c1762304854015b6ef6 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 18 Feb 2022 17:31:13 -0500 Subject: [PATCH] Disambiguate console from shell buffer There is room for the console replay to get confused, fix by fully qualifying the console name. --- confluent_server/confluent/consoleserver.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/consoleserver.py b/confluent_server/confluent/consoleserver.py index b7023361..7b165f71 100644 --- a/confluent_server/confluent/consoleserver.py +++ b/confluent_server/confluent/consoleserver.py @@ -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):