Close ServerChannelGroup when stopping the server (#69)

or else the pool will not get stopped
criteo · Nov 13, 2018 · c36999b · c36999b
1 parent f8f5d56
commit c36999b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/core/src/main/scala/Server.scala b/core/src/main/scala/Server.scala
@@ -247,11 +247,16 @@ object Server {
             }
           }
         }
+      private val group: ServerChannelGroup = NIO1SocketServerGroup.fixedGroup(workerThreads = 4)
       val ch =
-        NIO1SocketServerGroup.fixedGroup(workerThreads = 4).bind(new InetSocketAddress(address, port0), f)
+        group.bind(new InetSocketAddress(address, port0), f)
           .getOrElse(sys.error(s"Failed to start server on port $port0"))
       val socketAddress = ch.socketAddress
-      def stop() = ch.close()
+      def stop() = {
+        ch.close()
+        ch.join()
+        group.closeGroup
+      }
       def apply(req: Request) = serveRequest(req)
 
       // Keep the server alive until `stop()` is called.