development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: fix closing before stdio is drained

Browse source 
Fixes https://github.com/microsoft/vscode-remote-tunnels/issues/693
This commit is contained in:
Connor Peet 2023-10-18 15:37:02 -07:00
parent 94a319f942
commit 96d5db84d1
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cli/src/tunnels/control_server.rs
View file

@ -1037,7 +1037,14 @@ where
let futs = FuturesUnordered::new();
if let (Some(mut a), Some(mut b)) = (p.stdout.take(), stdout) {
futs.push(async move { tokio::io::copy(&mut a, &mut b).await }.boxed());
futs.push(
async move {
let r = tokio::io::copy(&mut a, &mut b).await;
// println!("copy exited with {:?}", r);
r
}
.boxed(),
);
}
if let (Some(mut a), Some(mut b)) = (p.stderr.take(), stderr) {
futs.push(async move { tokio::io::copy(&mut a, &mut b).await }.boxed());
@ -1110,13 +1117,7 @@ async fn wait_for_process_exit(
mut process: tokio::process::Child,
futs: FuturesUnordered<std::pin::Pin<Box<TokioCopyFuture>>>,
) -> Result<SpawnResult, AnyError> {
let closed = process.wait();
pin!(closed);
let r = tokio::select! {
_ = futures::future::join_all(futs) => closed.await,
r = &mut closed => r
};
let (_, r) = tokio::join!(futures::future::join_all(futs), process.wait());
let r = match r {
Ok(e) => SpawnResult {