diff --git a/actix-server/src/accept.rs b/actix-server/src/accept.rs index bf895f06..5c434709 100644 --- a/actix-server/src/accept.rs +++ b/actix-server/src/accept.rs @@ -401,7 +401,7 @@ impl Accept { // after the sleep a Timer interest is sent to Accept Poll let waker = self.waker.clone(); - System::current().arbiter().send(Box::pin(async move { + System::current().arbiter().spawn(Box::pin(async move { sleep_until(Instant::now() + Duration::from_millis(510)).await; waker.wake(WakerInterest::Timer); })); diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs index 08ab2d09..a78e4175 100644 --- a/actix-server/src/builder.rs +++ b/actix-server/src/builder.rs @@ -6,7 +6,7 @@ use std::{io, mem}; use actix_rt::net::TcpStream; use actix_rt::time::{sleep_until, Instant}; -use actix_rt::{spawn, System}; +use actix_rt::{self as rt, System}; use log::{error, info}; use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver}; use tokio::sync::oneshot; @@ -288,7 +288,7 @@ impl ServerBuilder { // start http server actor let server = self.server.clone(); - spawn(self); + rt::spawn(self); server } } @@ -364,7 +364,7 @@ impl ServerBuilder { let fut = join_all(iter); - spawn(async move { + rt::spawn(async move { let _ = fut.await; if let Some(tx) = completion { let _ = tx.send(()); @@ -373,16 +373,16 @@ impl ServerBuilder { let _ = tx.send(()); } if exit { - spawn(async { + rt::spawn(async { sleep_until(Instant::now() + Duration::from_millis(300)).await; System::current().stop(); }); } - }) + }); } else { // we need to stop system if server was spawned if self.exit { - spawn(async { + rt::spawn(async { sleep_until(Instant::now() + Duration::from_millis(300)).await; System::current().stop(); }); diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs index 91e98fc2..d54a0829 100644 --- a/actix-server/src/worker.rs +++ b/actix-server/src/worker.rs @@ -172,7 +172,7 @@ impl Worker { let avail = availability.clone(); // every worker runs in it's own arbiter. - Arbiter::new().send(Box::pin(async move { + Arbiter::new().spawn(Box::pin(async move { availability.set(false); let mut wrk = MAX_CONNS_COUNTER.with(move |conns| Worker { rx,