Skip to content

Fix session endpoint errors causing 'Error refreshing Manx' toast #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deacon-mp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix session endpoint errors causing 'Error refreshing Manx' toast #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5ecc6c
Fix session endpoint errors causing 'Error refreshing Manx' toast
deacon-mp Mar 16, 2026
7a43fea
fix: narrow exception handling in term_api and use structured logging
deacon-mp Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions app/term_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import logging
import os
import pathlib
from shutil import which
Expand All @@ -8,6 +9,8 @@
from app.utility.base_service import BaseService
from plugins.manx.app.term_svc import TermService

log = logging.getLogger(__name__)


class TermApi(BaseService):

Expand All @@ -22,24 +25,33 @@ def __init__(self, services):

@template('manx.html')
async def splash(self, request):
await self.term_svc.socket_conn.tcp_handler.refresh()
try:
sessions = [dict(id=s.id, info=a.paw, platform=a.platform, executors=a.executors)
for s in self.term_svc.socket_conn.tcp_handler.sessions
for a in await self.data_svc.locate('agents', match=dict(paw=s.paw))]
return dict(sessions=sessions, websocket=self.get_config('app.contact.websocket'))
await self.term_svc.socket_conn.tcp_handler.refresh()
except Exception as e:
print(e)
log.error('Failed to refresh TCP handler: %s', e)
return dict(sessions=[], websocket=self.get_config('app.contact.websocket'))
sessions = [dict(id=s.id, info=a.paw, platform=a.platform, executors=a.executors)
for s in self.term_svc.socket_conn.tcp_handler.sessions
for a in await self.data_svc.locate('agents', match=dict(paw=s.paw))]
return dict(sessions=sessions, websocket=self.get_config('app.contact.websocket'))

async def get_sessions(self, request):
await self.term_svc.socket_conn.tcp_handler.refresh()
try:
await self.term_svc.socket_conn.tcp_handler.refresh()
except Exception as e:
log.error('Failed to refresh TCP handler: %s', e)
raise web.HTTPInternalServerError(reason='Failed to refresh sessions')
Comment on lines +39 to +43
sessions = [dict(id=s.id, info=a.paw, platform=a.platform, executors=a.executors)
for s in self.term_svc.socket_conn.tcp_handler.sessions
for a in await self.data_svc.locate('agents', match=dict(paw=s.paw))]
return web.json_response(dict(sessions=sessions))

async def sessions(self, request):
await self.term_svc.socket_conn.tcp_handler.refresh()
try:
await self.term_svc.socket_conn.tcp_handler.refresh()
except Exception as e:
log.error('Failed to refresh TCP handler: %s', e)
raise web.HTTPInternalServerError(reason='Failed to refresh sessions')
Comment on lines +50 to +54
sessions = [dict(id=s.id, info=s.paw) for s in self.term_svc.socket_conn.tcp_handler.sessions]
return web.json_response(sessions)

Expand Down
Loading