Deuxfleurs/aerogramme
15
0
Fork 1
Code Issues 33 Pull requests 1 Projects 11 Releases 4 Wiki Activity

Replace with async

Browse source
This commit is contained in:
Quentin 2022-06-02 17:28:26 +02:00
parent 3370760891
commit deced08513
Signed by: quentin
GPG key ID: E9602264D639FF68
1 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/server.rs
View file

@ -23,14 +23,8 @@ pub struct Server {
pub login_provider: Box<dyn LoginProvider>, pub login_provider: Box<dyn LoginProvider>,
} }
async fn handle_req(req: Request) -> Result<Response> { struct Connection;
tracing::debug!("Got request: {:#?}", req); impl Service<Request> for Connection {
Ok(Response::ok("Done")?)
}
struct Echo;
impl Service<Request> for Echo {
type Response = Response; type Response = Response;
type Error = anyhow::Error; type Error = anyhow::Error;
type Future = Pin<Box<dyn futures::Future<Output = Result<Self::Response>> + Send>>; type Future = Pin<Box<dyn futures::Future<Output = Result<Self::Response>> + Send>>;
@ -40,15 +34,16 @@ impl Service<Request> for Echo {
} }
fn call(&mut self, req: Request) -> Self::Future { fn call(&mut self, req: Request) -> Self::Future {
println!("Got request: {:#?}", req); Box::pin(async move {
let fut = futures::future::ok(Response::ok("Done").unwrap()); println!("Got request: {:#?}", req);
Box::pin(fut) Ok(Response::ok("Done")?)
})
} }
} }
struct Charlie; struct Instance;
impl<'a> Service<&'a AddrStream> for Charlie { impl<'a> Service<&'a AddrStream> for Instance {
type Response = Echo; type Response = Connection;
type Error = anyhow::Error; type Error = anyhow::Error;
type Future = Pin<Box<dyn futures::Future<Output = Result<Self::Response>> + Send>>; type Future = Pin<Box<dyn futures::Future<Output = Result<Self::Response>> + Send>>;
@ -58,8 +53,9 @@ impl<'a> Service<&'a AddrStream> for Charlie {
fn call(&mut self, addr: &'a AddrStream) -> Self::Future { fn call(&mut self, addr: &'a AddrStream) -> Self::Future {
println!("{}, {}", addr.remote_addr, addr.local_addr); println!("{}, {}", addr.remote_addr, addr.local_addr);
let fut = futures::future::ok(Echo); Box::pin(async {
Box::pin(fut) Ok(Connection)
})
} }
} }
@ -88,19 +84,7 @@ impl Server {
let incoming = AddrIncoming::new("127.0.0.1:4567").await?; let incoming = AddrIncoming::new("127.0.0.1:4567").await?;
let server = ImapServer::new(incoming).serve(Instance);
/*let make_service = tower::service_fn(|addr: &AddrStream| {
tracing::debug!(remote_addr = %addr.remote_addr, local_addr = %addr.local_addr, "accept");
//let service = tower::ServiceBuilder::new().service_fn(handle_req);
//let service = tower::service_fn(handle_req);
let service = Echo;
futures::future::ok::<_, std::convert::Infallible>(service)
//service
});*/
//println!("{:?}", make_service);
let server = ImapServer::new(incoming).serve(Charlie);
let _ = server.await?; let _ = server.await?;
/*let creds = self.login_provider.login("quentin", "poupou").await?; /*let creds = self.login_provider.login("quentin", "poupou").await?;