Skip to content
Merged
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
20 changes: 14 additions & 6 deletions src/murfey/client/rsync.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,8 @@ def parse_stdout(line: str):
# This marks the start of a transfer, wait for the progress line
next_file = update
return
logger.warning(f"Unknown line from rsync {line}")
return

def parse_stderr(line: str):
if line.strip():
Expand Down Expand Up @@ -563,13 +565,19 @@ def parse_stderr(line: str):
self.notify(update)
success = False

if result is None:
if result is None and files:
# Only log this as an error if files were scheduled for transfer
if files:
logger.error(f"No rsync process ran for files: {files}")
else:
logger.log(
logging.WARNING if result.returncode else logging.DEBUG,
logger.error(f"No rsync process ran for files: {files}")
elif result and result.returncode:
logger.warning(
f"rsync process finished with return code {result.returncode}",
)
elif not success:
logger.info(
"rsync process failed for some files: "
f"requested {len(relative_filenames)}, transferred {len(transfer_success)}",
)
else:
logger.debug("rsync process finished successfully")

return success