From 285c73e95ea4a011673bcd4f84a26d2aee84e592 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sun, 20 May 2018 20:47:20 -0700
Subject: [PATCH] Re-use tcp listener on pause/resume

---
 CHANGES.md           |  2 ++
 src/server/srv.rs    | 16 +++-------------
 src/server/worker.rs |  4 ++--
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0e663644..7a751b64 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,8 @@
 
 * Fix scope resource path extractor #234
 
+* Re-use tcp listener on pause/resume
+
 
 ## 0.6.7 (2018-05-17)
 
diff --git a/src/server/srv.rs b/src/server/srv.rs
index 7ed533bf..18663103 100644
--- a/src/server/srv.rs
+++ b/src/server/srv.rs
@@ -450,7 +450,6 @@ impl<H: IntoHttpHandler> HttpServer<H> {
                 self.accept.push(start_accept_thread(
                     token,
                     sock,
-                    self.backlog,
                     tx.clone(),
                     socks.clone(),
                     workers.clone(),
@@ -782,7 +781,7 @@ enum Command {
 }
 
 fn start_accept_thread(
-    token: usize, sock: Socket, backlog: i32, srv: mpsc::UnboundedSender<ServerCommand>,
+    token: usize, sock: Socket, srv: mpsc::UnboundedSender<ServerCommand>,
     socks: Slab<SocketInfo>,
     mut workers: Vec<(usize, mpsc::UnboundedSender<Conn<net::TcpStream>>)>,
 ) -> (mio::SetReadiness, sync_mpsc::Sender<Command>) {
@@ -892,8 +891,8 @@ fn start_accept_thread(
                         },
                         CMD => match rx.try_recv() {
                             Ok(cmd) => match cmd {
-                                Command::Pause => if let Some(server) = server.take() {
-                                    if let Err(err) = poll.deregister(&server) {
+                                Command::Pause => if let Some(ref server) = server {
+                                    if let Err(err) = poll.deregister(server) {
                                         error!(
                                             "Can not deregister server socket {}",
                                             err
@@ -906,15 +905,6 @@ fn start_accept_thread(
                                     }
                                 },
                                 Command::Resume => {
-                                    let lst = create_tcp_listener(addr, backlog)
-                                        .expect("Can not create net::TcpListener");
-
-                                    server = Some(
-                                        mio::net::TcpListener::from_std(lst).expect(
-                                            "Can not create mio::net::TcpListener",
-                                        ),
-                                    );
-
                                     if let Some(ref server) = server {
                                         if let Err(err) = poll.register(
                                             server,
diff --git a/src/server/worker.rs b/src/server/worker.rs
index 012acd6e..f045074d 100644
--- a/src/server/worker.rs
+++ b/src/server/worker.rs
@@ -239,9 +239,9 @@ impl StreamHandlerType {
         match *self {
             StreamHandlerType::Normal => "http",
             #[cfg(feature = "tls")]
-            StreamHandlerType::Tls(ref acceptor) => "https",
+            StreamHandlerType::Tls(_) => "https",
             #[cfg(feature = "alpn")]
-            StreamHandlerType::Alpn(ref acceptor) => "https",
+            StreamHandlerType::Alpn(_) => "https",
         }
     }
 }