xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix console over shared websocket

Browse Source 
This fixes console behavior in the webui
This commit is contained in:
Jarrod Johnson 2024-06-13 16:57:20 -04:00
parent b6a0250e5c
commit f42812b836
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
confluent_server/confluent/httpapi.py
View File

@ -30,7 +30,7 @@ from aiohttp import web, web_urldispatcher, connector, ClientSession, WSMsgType
import confluent.auth as auth
import confluent.config.attributes as attribs
import confluent.config.configmanager as configmanager
#import confluent.consoleserver as consoleserver
import confluent.consoleserver as consoleserver
import confluent.discovery.core as disco
import confluent.forwarder as forwarder
import confluent.exceptions as exc
@ -424,10 +424,10 @@ def websockify_data(data):
data = u' ' + data
return data
def datacallback_bound(clientsessid, ws):
def datacallback(data):
def datacallback_bound(clientsessid, rsp):
async def datacallback(data):
data = websockify_data(data)
ws.send('${0}$'.format(clientsessid) + data)
await rsp.send_str(u'${0}$'.format(clientsessid) + data)
return datacallback
async def wsock_handler(req):
@ -485,7 +485,7 @@ async def wsock_handler(req):
elif clientmsg[0] == '$':
targid, data = clientmsg[1:].split('$', 1)
if data[0] == ' ':
myconsoles[targid].write(data[1:])
await myconsoles[targid].write(data[1:])
elif clientmsg[0] == '!':
msg = json.loads(clientmsg[1:])
action = msg.get('operation', None)
@ -514,7 +514,7 @@ async def wsock_handler(req):
auditmsg = {'operation': 'start', 'target': targ,
'user': util.stringify(username)}
auditlog.log(auditmsg)
datacallback = datacallback_bound(clientsessid, ws)
datacallback = datacallback_bound(clientsessid, rsp)
if shellsession:
consession = shellserver.ShellSession(
node=node, configmanager=cfgmgr,