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

Update `netservices` to 0.2.2 

This includes a small change in how the EOF is sent as well.
This commit is contained in:
Alexis Sellier 2023-04-17 15:53:31 +02:00
parent cb79ebef76
commit c99497eb21
No known key found for this signature in database
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1467,9 +1467,9 @@ dependencies = [
[[package]] [[package]]
name = "netservices" name = "netservices"
version = "0.2.1" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f51055f5481bdb91d30a7bd731c215325b2f4a6ed437fd9c43fdaef72d49fa53" checksum = "888832afc021aa978d7cfcf5cbe9a694c066e21ea503791e4b8fcc82c5b7bc6f"
dependencies = [ dependencies = [
"amplify", "amplify",
"cyphernet", "cyphernet",

2
radicle-node/Cargo.toml
View File

@ -25,7 +25,7 @@ lexopt = { version = "0.2.1" }
libc = { version = "0.2.137" } libc = { version = "0.2.137" }
log = { version = "0.4.17", features = ["std"] } log = { version = "0.4.17", features = ["std"] }
localtime = { version = "1.2.0" } localtime = { version = "1.2.0" }
netservices = { version = "0.2.1", features = ["io-reactor", "socket2"] } netservices = { version = "0.2.2", features = ["io-reactor", "socket2"] }
nonempty = { version = "0.8.1", features = ["serialize"] } nonempty = { version = "0.8.1", features = ["serialize"] }
qcheck = { version = "1", default-features = false, optional = true } qcheck = { version = "1", default-features = false, optional = true }
sqlite = { version = "0.30.3" } sqlite = { version = "0.30.3" }

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

@ -346,7 +346,7 @@ impl Worker {
match daemon_r.read(&mut buffer) { match daemon_r.read(&mut buffer) {
Ok(0) => break, Ok(0) => break,
Ok(n) => { Ok(n) => {
stream_w.write_all(&buffer[..n]).unwrap(); stream_w.write_all(&buffer[..n])?;
if let Err(e) = self.handle.flush(remote, stream) { if let Err(e) = self.handle.flush(remote, stream) {
log::error!(target: "worker", "Worker channel disconnected; aborting"); log::error!(target: "worker", "Worker channel disconnected; aborting");
@ -362,7 +362,7 @@ impl Worker {
} }
} }
} }
Ok(()) Self::eof(remote, stream, stream_w, &mut self.handle).map_err(UploadError::from)
}); });
let stream_to_daemon = s.spawn(move || -> Result<(), io::Error> { let stream_to_daemon = s.spawn(move || -> Result<(), io::Error> {
@ -382,9 +382,7 @@ impl Worker {
daemon_to_stream.join().unwrap()?; daemon_to_stream.join().unwrap()?;
Ok::<(), UploadError>(()) Ok::<(), UploadError>(())
})?; })
Self::eof(remote, stream, stream_w, &mut self.handle).map_err(UploadError::from)
} }
fn _fetch<S>( fn _fetch<S>(