serv/dufs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: panic when bind already used port

Browse source
This commit is contained in:
sigoden 2022-06-03 07:15:41 +08:00
parent 51cedf2f8a
commit 34bc8d411a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server.rs
View file

@ -63,7 +63,7 @@ pub async fn serve(args: Args) -> BoxResult<()> {
.with_single_cert(certs.clone(), key.clone())?; .with_single_cert(certs.clone(), key.clone())?;
let tls_acceptor = TlsAcceptor::from(Arc::new(config)); let tls_acceptor = TlsAcceptor::from(Arc::new(config));
let arc_acceptor = Arc::new(tls_acceptor); let arc_acceptor = Arc::new(tls_acceptor);
let listener = TcpListener::bind(&socket_addr).await.unwrap(); let listener = TcpListener::bind(&socket_addr).await?;
let incoming = tokio_stream::wrappers::TcpListenerStream::new(listener); let incoming = tokio_stream::wrappers::TcpListenerStream::new(listener);
let incoming = hyper::server::accept::from_stream(incoming.filter_map(|socket| async { let incoming = hyper::server::accept::from_stream(incoming.filter_map(|socket| async {
match socket { match socket {
@ -86,7 +86,7 @@ pub async fn serve(args: Args) -> BoxResult<()> {
print_listening(args.address.as_str(), args.port, true); print_listening(args.address.as_str(), args.port, true);
server.await?; server.await?;
} else { } else {
let server = hyper::Server::bind(&socket_addr).serve(make_service_fn(move |_| { let server = hyper::Server::try_bind(&socket_addr)?.serve(make_service_fn(move |_| {
let inner = inner.clone(); let inner = inner.clone();
async move { async move {
Ok::<_, Infallible>(service_fn(move |req| { Ok::<_, Infallible>(service_fn(move |req| {