Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions src/murfey/client/multigrid_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@ async def dormancy_check(self):
log.warning(f"Could not delete database data for {self.session_id}")
self.dormant = True

def abandon(self):
for a in self.analysers.values():
a.request_stop()
for w in self._environment.watchers.values():
w.request_stop()
for p in self.rsync_processes.values():
p.request_stop()

def finalise(self):
for a in self.analysers.values():
a.request_stop()
Expand Down
4 changes: 4 additions & 0 deletions src/murfey/client/rsync.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ def stop(self):
self.thread.join()
logger.debug("RSync thread stop completed")

def request_stop(self):
self._stopping = True
self._halt_thread = True

def finalise(
self,
thread: bool = True,
Expand Down
6 changes: 6 additions & 0 deletions src/murfey/instrument_server/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,12 @@ def remove_rsyncer(session_id: MurfeySessionID, rsyncer_source: RsyncerSource):
return {"success": True}


@router.post("/sessions/{session_id}/abandon_controller")
def abandon_controller(session_id: MurfeySessionID):
controllers[session_id].abandon()
return {"success": True}


@router.post("/sessions/{session_id}/finalise_rsyncer")
def finalise_rsyncer(session_id: MurfeySessionID, rsyncer_source: RsyncerSource):
controllers[session_id]._finalise_rsyncer(rsyncer_source.source)
Expand Down
21 changes: 21 additions & 0 deletions src/murfey/server/api/instrument.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,27 @@
return data


@router.post("/sessions/{session_id}/abandon_session")
async def abandon_session(session_id: MurfeySessionID, db=murfey_db):
data = {}
instrument_name = (
db.exec(select(Session).where(Session.id == session_id)).one().instrument_name
)
machine_config = get_machine_config(instrument_name=instrument_name)[
instrument_name
]
if machine_config.instrument_server_url:
async with aiohttp.ClientSession() as clientsession:
async with clientsession.post(
f"{machine_config.instrument_server_url}/sessions/{session_id}/abandon_controller",
headers={
"Authorization": f"Bearer {instrument_server_tokens[session_id]['access_token']}"
},
) as resp:
data = await resp.json()
return data


@router.post("/sessions/{session_id}/remove_rsyncer")
async def remove_rsyncer(
session_id: MurfeySessionID, rsyncer_source: RsyncerSource, db=murfey_db
Expand Down