berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

reduce unnecessary async block

This commit is contained in:
fakeshadow 2021-04-27 01:12:31 +08:00
parent 88497fd9f3
commit dfca786911
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actix-server/src/builder.rs
View File

@ -6,7 +6,7 @@ use std::{
time::Duration, time::Duration,
}; };
use actix_rt::{self as rt, net::TcpStream, time::sleep, System}; use actix_rt::{net::TcpStream, time::sleep, System};
use futures_core::future::BoxFuture; use futures_core::future::BoxFuture;
use log::{error, info}; use log::{error, info};
use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver}; use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver};
@ -313,7 +313,7 @@ impl ServerBuilder {
// start http server actor // start http server actor
let server = self.server.clone(); let server = self.server.clone();
rt::spawn(self); actix_rt::spawn(self);
server server
} }
} }
@ -331,10 +331,7 @@ impl ServerBuilder {
F: Fn() -> Fut + 'static, F: Fn() -> Fut + 'static,
Fut: Future<Output = ()> + Send + 'static, Fut: Future<Output = ()> + Send + 'static,
{ {
self.on_stop = Box::new(move || { self.on_stop = Box::new(move || Box::pin(func()));
let fut = func();
Box::pin(async move { fut.await })
});
self self
} }
@ -401,6 +398,7 @@ impl ServerBuilder {
// stop accept thread // stop accept thread
self.accept.wake(WakerInterest::Stop); self.accept.wake(WakerInterest::Stop);
let notify = std::mem::take(&mut self.notify); let notify = std::mem::take(&mut self.notify);
// take the on_stop future. // take the on_stop future.
@ -415,7 +413,7 @@ impl ServerBuilder {
.map(move |worker| worker.1.stop(graceful)) .map(move |worker| worker.1.stop(graceful))
.collect(); .collect();
rt::spawn(async move { actix_rt::spawn(async move {
on_stop().await; on_stop().await;
if graceful { if graceful {