From 9614da4e5f05fb62f3b6db1c56b50a6cfbcf1b67 Mon Sep 17 00:00:00 2001 From: jonaro00 <54029719+jonaro00@users.noreply.github.com> Date: Fri, 1 Mar 2024 09:46:32 +0100 Subject: [PATCH] fix(cargo-shuttle): windows build (#1648) --- cargo-shuttle/src/lib.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cargo-shuttle/src/lib.rs b/cargo-shuttle/src/lib.rs index 727a5b248..88192167d 100644 --- a/cargo-shuttle/src/lib.rs +++ b/cargo-shuttle/src/lib.rs @@ -1489,7 +1489,6 @@ impl Shuttle { #[cfg(target_family = "windows")] async fn local_run(&self, mut run_args: RunArgs) -> Result { let services = self.pre_local_run(&run_args).await?; - let (provisioner_server, provisioner_port) = Shuttle::setup_local_provisioner().await?; // Start all the services. let mut runtimes: Vec<(Child, runtime::Client)> = Vec::new(); @@ -1499,8 +1498,8 @@ impl Shuttle { let mut signal_received = false; for (i, service) in services.iter().enumerate() { signal_received = tokio::select! { - res = Shuttle::spin_local_runtime(&run_args, service, &provisioner_server, i as u16, provisioner_port) => { - Shuttle::add_runtime_info(res.unwrap(), &mut runtimes, &[&provisioner_server]).await?; + res = Shuttle::spin_local_runtime(&run_args, service, i as u16) => { + Shuttle::add_runtime_info(res.unwrap(), &mut runtimes).await?; false }, _ = Shuttle::handle_signals() => { @@ -1519,7 +1518,6 @@ impl Shuttle { // If prior signal received is set to true we must stop all the existing runtimes and // exit the `local_run`. if signal_received { - provisioner_server.abort(); for (mut rt, mut rt_client) in runtimes { Shuttle::stop_runtime(&mut rt, &mut rt_client) .await @@ -1557,7 +1555,6 @@ impl Shuttle { println!( "Killing all the runtimes..." ); - provisioner_server.abort(); Shuttle::stop_runtime(&mut rt, &mut rt_client).await.unwrap_or_else(|err| { trace!(status = ?err, "stopping the runtime errored out"); });