src/api/generic_server.rs

@@ -2,7 +2,6 @@ use std::convert::Infallible;
 use std::fs::{self, Permissions};
 use std::os::unix::fs::PermissionsExt;
 use std::sync::Arc;
-use std::time::Duration;
 
 use async_trait::async_trait;
 
@@ -20,7 +19,6 @@ use hyper_util::rt::TokioIo;
 use tokio::io::{AsyncRead, AsyncWrite};
 use tokio::net::{TcpListener, TcpStream, UnixListener, UnixStream};
 use tokio::sync::watch;
-use tokio::time::{sleep_until, Instant};
 
 use opentelemetry::{
 	global,
@@ -293,7 +291,7 @@ where
 	let connection_collector = tokio::spawn({
 		let server_name = server_name.clone();
 		async move {
-			let mut connections = FuturesUnordered::<tokio::task::JoinHandle<()>>::new();
+			let mut connections = FuturesUnordered::new();
 			loop {
 				let collect_next = async {
 					if connections.is_empty() {
@@ -314,34 +312,23 @@ where
 					}
 				}
 			}
-			let deadline = Instant::now() + Duration::from_secs(10);
+			if !connections.is_empty() {
-			while !connections.is_empty() {
 				info!(
-					"{} server: {} connections still open, deadline in {:.2}s",
+					"{} server: {} connections still open",
 					server_name,
-					connections.len(),
+					connections.len()
-					(deadline - Instant::now()).as_secs_f32(),
 				);
-				tokio::select! {
+				while let Some(conn_res) = connections.next().await {
-					conn_res = connections.next() => {
+					trace!(
-						trace!(
+						"{} server: HTTP connection finished: {:?}",
-							"{} server: HTTP connection finished: {:?}",
+						server_name,
-							server_name,
+						conn_res
-							conn_res.unwrap(),
+					);
-						);
+					info!(
-					}
+						"{} server: {} connections still open",
-					_ = sleep_until(deadline) => {
+						server_name,
-						warn!("{} server: exit deadline reached with {} connections still open, killing them now",
+						connections.len()
-							server_name,
+					);
-							connections.len());
-						for conn in connections.iter() {
-							conn.abort();
-						}
-						for conn in connections {
-							assert!(conn.await.unwrap_err().is_cancelled());
-						}
-						break;
-					}
 				}
 			}
 		}