itsscb/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2025-09-30 06:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

serve: Inline handle_connection into callers

Browse Source
This commit is contained in:
Jonas Platte 2025-04-26 23:22:44 +02:00
parent f6008c173c
commit bfb94cfd1e
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
axum/src/serve/mod.rs
View File

@ -191,7 +191,15 @@ where
loop { loop {
let (io, remote_addr) = listener.accept().await; let (io, remote_addr) = listener.accept().await;
handle_connection(&mut make_service, &signal_tx, &close_rx, io, remote_addr).await; let io = TokioIo::new(io);
let conn_service = prep_serve_connection(&mut make_service, remote_addr, &io).await;
tokio::spawn(serve_connection(
io,
conn_service,
signal_tx.clone(),
close_rx.clone(),
));
} }
} }
} }
@ -293,8 +301,15 @@ where
break; break;
} }
}; };
let io = TokioIo::new(io);
handle_connection(&mut make_service, &signal_tx, &close_rx, io, remote_addr).await; let conn_service = prep_serve_connection(&mut make_service, remote_addr, &io).await;
tokio::spawn(serve_connection(
io,
conn_service,
signal_tx.clone(),
close_rx.clone(),
));
} }
drop(close_rx); drop(close_rx);
@ -352,31 +367,6 @@ where
} }
} }
async fn handle_connection<L, M, S>(
make_service: &mut M,
signal_tx: &watch::Sender<()>,
close_rx: &watch::Receiver<()>,
io: <L as Listener>::Io,
remote_addr: <L as Listener>::Addr,
) where
L: Listener,
L::Addr: Debug,
M: for<'a> Service<IncomingStream<'a, L>, Error = Infallible, Response = S> + Send + 'static,
for<'a> <M as Service<IncomingStream<'a, L>>>::Future: Send,
S: Service<Request, Response = Response, Error = Infallible> + Clone + Send + 'static,
S::Future: Send,
{
let io = TokioIo::new(io);
let conn_service = prep_serve_connection(make_service, remote_addr, &io).await;
tokio::spawn(serve_connection(
io,
conn_service,
signal_tx.clone(),
close_rx.clone(),
));
}
async fn prep_serve_connection<L, M, S>( async fn prep_serve_connection<L, M, S>(
make_service: &mut M, make_service: &mut M,
remote_addr: <L as Listener>::Addr, remote_addr: <L as Listener>::Addr,