Skip to content

Commit a9c44ae

Browse files
committed
A few missing bits of logic
1 parent 703458e commit a9c44ae

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/murfey/client/multigrid_control.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ def __post_init__(self):
9999

100100
def _multigrid_watcher_finalised(self):
101101
self.multigrid_watcher_active = False
102+
self.dormancy_check()
102103

103104
def dormancy_check(self):
104105
if not self.multigrid_watcher_active:

src/murfey/instrument_server/api.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,9 @@ def start_multigrid_watcher(
179179
destination_overrides=watcher_spec.destination_overrides,
180180
)
181181
)
182-
watchers[session_id].subscribe(controllers[session_id]._multigrid_watcher_finalised)
182+
watchers[session_id].subscribe(
183+
controllers[session_id]._multigrid_watcher_finalised, final=True
184+
)
183185
watchers[session_id].start()
184186
return {"success": True}
185187

@@ -219,6 +221,7 @@ def finalise_rsyncer(session_id: MurfeySessionID, rsyncer_source: RsyncerSource)
219221

220222
@router.post("/sessions/{session_id}/finalise_session")
221223
def finalise_session(session_id: MurfeySessionID):
224+
watchers[session_id].request_stop()
222225
controllers[session_id].finalise()
223226
return {"success": True}
224227

0 commit comments

Comments
 (0)