Skip to content

Commit 9614da4

Browse files
authored
fix(cargo-shuttle): windows build (#1648)
1 parent 30f075a commit 9614da4

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

cargo-shuttle/src/lib.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,6 @@ impl Shuttle {
14891489
#[cfg(target_family = "windows")]
14901490
async fn local_run(&self, mut run_args: RunArgs) -> Result<CommandOutcome> {
14911491
let services = self.pre_local_run(&run_args).await?;
1492-
let (provisioner_server, provisioner_port) = Shuttle::setup_local_provisioner().await?;
14931492

14941493
// Start all the services.
14951494
let mut runtimes: Vec<(Child, runtime::Client)> = Vec::new();
@@ -1499,8 +1498,8 @@ impl Shuttle {
14991498
let mut signal_received = false;
15001499
for (i, service) in services.iter().enumerate() {
15011500
signal_received = tokio::select! {
1502-
res = Shuttle::spin_local_runtime(&run_args, service, &provisioner_server, i as u16, provisioner_port) => {
1503-
Shuttle::add_runtime_info(res.unwrap(), &mut runtimes, &[&provisioner_server]).await?;
1501+
res = Shuttle::spin_local_runtime(&run_args, service, i as u16) => {
1502+
Shuttle::add_runtime_info(res.unwrap(), &mut runtimes).await?;
15041503
false
15051504
},
15061505
_ = Shuttle::handle_signals() => {
@@ -1519,7 +1518,6 @@ impl Shuttle {
15191518
// If prior signal received is set to true we must stop all the existing runtimes and
15201519
// exit the `local_run`.
15211520
if signal_received {
1522-
provisioner_server.abort();
15231521
for (mut rt, mut rt_client) in runtimes {
15241522
Shuttle::stop_runtime(&mut rt, &mut rt_client)
15251523
.await
@@ -1557,7 +1555,6 @@ impl Shuttle {
15571555
println!(
15581556
"Killing all the runtimes..."
15591557
);
1560-
provisioner_server.abort();
15611558
Shuttle::stop_runtime(&mut rt, &mut rt_client).await.unwrap_or_else(|err| {
15621559
trace!(status = ?err, "stopping the runtime errored out");
15631560
});

0 commit comments

Comments
 (0)