From 3cf9edeeb867c9971bd49e0f1cda3b8078e54bc3 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 22 Feb 2022 08:49:31 -0500
Subject: [PATCH] Stub out buffering for shell sessions
This is not yet handled anyway.
For future, establish norm of a nodeid
to prefix multiple distinct sessions.
---
confluent_server/confluent/consoleserver.py | 5 +++--
confluent_server/confluent/shellserver.py | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/confluent_server/confluent/consoleserver.py b/confluent_server/confluent/consoleserver.py
index 7b165f71..37274792 100644
--- a/confluent_server/confluent/consoleserver.py
+++ b/confluent_server/confluent/consoleserver.py
@@ -126,6 +126,7 @@ class ConsoleHandler(object):
'collective.manager'))
def __init__(self, node, configmanager, width=80, height=24):
+ self.termprefix = 'c_'
self.clearpending = False
self.clearerror = False
self.initsize = (width, height)
@@ -190,7 +191,7 @@ class ConsoleHandler(object):
if self.pendingbytes is not None:
self.pendingbytes += data
self.pendingbytes = b''
- nodeid = self._plugin_path.format(self.node)
+ nodeid = self.termprefix + self.node
try:
send_output(nodeid, data)
data = self.pendingbytes
@@ -548,7 +549,7 @@ class ConsoleHandler(object):
'connectstate': self.connectstate,
'clientcount': len(self.livesessions),
}
- nodeid = self._plugin_path.format(self.node)
+ nodeid = self.termprefix + self.node
retdata = get_buffer_output(nodeid)
return retdata, connstate
diff --git a/confluent_server/confluent/shellserver.py b/confluent_server/confluent/shellserver.py
index 7a2c1027..5c23edc3 100644
--- a/confluent_server/confluent/shellserver.py
+++ b/confluent_server/confluent/shellserver.py
@@ -37,6 +37,10 @@ class _ShellHandler(consoleserver.ConsoleHandler):
# suppress logging through proving a stub 'log' function
return
+ def feedbuffer(self, data):
+ return
+ #return super().feedbuffer(data)
+
def _got_disconnected(self):
self.connectstate = 'closed'
self._send_rcpts({'connectstate': self.connectstate})