Skip to content

RSyncer finalisation restructure #445

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

Merged
stephen-riggs merged 1 commit into from
Jan 14, 2025
Merged

RSyncer finalisation restructure #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/murfey/client/multigrid_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ def _finalise_rsyncer(self, source: Path):
finalise_thread = threading.Thread(
name=f"Controller finaliser thread ({source})",
target=self.rsync_processes[source].finalise,
kwargs={"thread": False},
daemon=True,
)
finalise_thread.start()
Expand Down
21 changes: 12 additions & 9 deletions src/murfey/client/rsync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,18 +172,21 @@ def stop(self):
self.thread.join()
logger.debug("RSync thread stop completed")

def finalise(self):
def finalise(self, thread: bool = True):
self.stop()
self._remove_files = True
self._notify = False
self.thread = threading.Thread(
name=f"RSync finalisation {self._basepath}:{self._remote}",
target=self._process,
daemon=True,
)
for f in self._basepath.glob("**/*"):
self.queue.put(f)
self.stop()
if thread:
self.thread = threading.Thread(
name=f"RSync finalisation {self._basepath}:{self._remote}",
target=self._process,
daemon=True,
)
for f in self._basepath.glob("**/*"):
self.queue.put(f)
self.stop()
else:
self._transfer(list(self._basepath.glob("**/*")))

def enqueue(self, file_path: Path):
if not self._stopping:
Expand Down
Loading