From ca2fc2f2f173c95b96dfc87c9dcd0804fb597e00 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 12 Feb 2023 14:55:27 +0100 Subject: fixed early exit when only one listerner was enabled --- src/main.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index eb91b05..38fae53 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,6 +20,7 @@ use std::{fs::File, io::BufReader, net::SocketAddr, path::Path, sync::Arc}; use tokio::{ io::{AsyncRead, AsyncWrite}, net::{TcpListener, TcpStream}, + signal::ctrl_c, }; use tokio_rustls::TlsAcceptor; @@ -42,10 +43,9 @@ async fn main() -> anyhow::Result<()> { ))?; let config = Arc::new(Config::load(&config_path)?); - tokio::select! { - x = serve_http(config.clone()) => x.context("serving http")?, - x = serve_https(config.clone()) => x.context("serving https")?, - }; + tokio::spawn(serve_http(config.clone())); + tokio::spawn(serve_https(config.clone())); + ctrl_c().await.unwrap(); Ok(()) } -- cgit v1.2.3-70-g09d2