mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Fix superfluous fetch error on macOS 

On macOS, shutting down a socket returns an error if the socket is
already closed. We don't consider that a problem, as it just returns
`Ok(())` on Linux.
This commit is contained in:
Alexis Sellier 2023-05-03 17:20:32 +02:00
parent 0886ab0a3c
commit c20421b0c6
No known key found for this signature in database
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
radicle-node/src/worker.rs
View File

@ -214,7 +214,7 @@ impl Worker {
Err(e) => break Err(e), Err(e) => break Err(e),
} }
}; };
log::debug!(target: "worker", "Upload process on stream {stream} exited successfully"); log::debug!(target: "worker", "Upload process on stream {stream} exited with result {result:?}");
FetchResult::Responder { result } FetchResult::Responder { result }
} }
@ -315,7 +315,7 @@ impl Worker {
match self._upload_pack(rid, remote, request, stream, stream_r, stream_w) { match self._upload_pack(rid, remote, request, stream, stream_r, stream_w) {
Ok(()) => { Ok(()) => {
log::debug!(target: "worker", "Upload of {rid} to {remote} exited successfully"); log::debug!(target: "worker", "Upload of {rid} to {remote} on stream {stream} exited successfully");
Ok(ControlFlow::Continue(())) Ok(ControlFlow::Continue(()))
} }
@ -372,9 +372,17 @@ impl Worker {
})?; })?;
let stream_to_daemon = s.spawn(move || { let stream_to_daemon = s.spawn(move || {
stream_r match stream_r
.pipe(&mut daemon_w) .pipe(&mut daemon_w)
.and_then(|()| daemon_w.shutdown(net::Shutdown::Both)) .and_then(|()| daemon_w.shutdown(net::Shutdown::Both))
{
Ok(()) => Ok(()),
// On macOS, this error is returned if the socket is already closed.
// We don't consider that a problem, as it just returns `Ok(())` on
// Linux.
Err(e) if e.kind() == io::ErrorKind::NotConnected => Ok(()),
Err(e) => Err(e),
}
}); });
stream_to_daemon.join().unwrap()?; stream_to_daemon.join().unwrap()?;