diff --git a/actix-server/src/accept.rs b/actix-server/src/accept.rs index 664728fd..9f7872f8 100644 --- a/actix-server/src/accept.rs +++ b/actix-server/src/accept.rs @@ -217,8 +217,6 @@ impl Accept { self.deregister_all(sockets); } - self.terminate_all(sockets); - return true; } @@ -332,10 +330,6 @@ impl Accept { .for_each(|(_, info)| self.deregister_logged(info)); } - fn terminate_all(&self, sockets: &mut [ServerSocketInfo]) { - sockets.iter().for_each(|s| s.lst.terminate()); - } - // Send connection to worker and handle error. fn send_connection(&mut self, conn: Conn) -> Result<(), Conn> { let next = self.next(); diff --git a/actix-server/src/socket.rs b/actix-server/src/socket.rs index adb165b8..85cfb143 100644 --- a/actix-server/src/socket.rs +++ b/actix-server/src/socket.rs @@ -41,20 +41,6 @@ impl MioListener { MioListener::Uds(ref lst) => lst.accept().map(|(stream, _)| MioStream::Uds(stream)), } } - - pub(crate) fn terminate(&self) { - match *self { - MioListener::Tcp(_) => (), - #[cfg(unix)] - MioListener::Uds(ref lst) => { - if let Ok(addr) = lst.local_addr() { - if let Some(path) = addr.as_pathname() { - let _ = std::fs::remove_file(path); - } - } - } - } - } } impl Source for MioListener { @@ -274,17 +260,4 @@ mod tests { assert!(format!("{}", lst).contains("/tmp/sock.xxxxx")); } } - - #[test] - #[cfg(unix)] - fn uds_terminate() { - let socket_path = std::path::Path::new("/tmp/sock.xxxx1"); - let _ = std::fs::remove_file(socket_path); - if let Ok(socket) = MioUnixListener::bind(socket_path) { - let listener = MioListener::Uds(socket); - assert!(socket_path.exists()); - listener.terminate(); - assert!(!socket_path.exists()); - } - } }