Radish alpha
h
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
node: simplify upload-pack reader joining
Fintan Halpenny committed 2 years ago
commit de434bb437f64b0ed262a5bb089c6a82a18312eb
parent 740106d7595c4e2722ca2c8d0f6ee34f751f06d2
1 file changed +3 -7
modified radicle-node/src/worker/upload_pack.rs
@@ -124,14 +124,10 @@ where

        // N.b. we only care if the `reader` is finished. We then kill
        // the child which will end the thread for the sender.
-
        loop {
-
            if reader.is_finished() {
-
                child.kill()?;
-
                break;
-
            } else {
-
                std::thread::sleep(std::time::Duration::from_millis(100));
-
            }
+
        if let Err(e) = reader.join() {
+
            log::warn!(target: "worker", "Upload pack thread panicked: {e:?}");
        }
+
        child.kill()?;
        Ok::<_, io::Error>(())
    })?;