From eed2b9aeec61ac9132c3238c29bcff7e14694499 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Tue, 19 Aug 2014 21:56:37 +0100 Subject: [PATCH] Fix Shutdown --- server.go | 5 ++--- server_test.go | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/server.go b/server.go index 3e25126f..b9257473 100644 --- a/server.go +++ b/server.go @@ -304,15 +304,14 @@ func (srv *Server) ActivateAndServe() error { // ActivateAndServe will return. func (srv *Server) Shutdown() { c := new(Client) + c.Net = srv.Net switch srv.Net { case "tcp", "tcp4", "tcp6": - c.Net = "tcp" go func() { srv.stopTCP <- true }() - c.Exchange(new(Msg), srv.Addr) case "udp", "udp4", "udp6": go func() { srv.stopUDP <- true }() - c.Exchange(new(Msg), srv.Addr) } + c.Exchange(new(Msg), srv.Addr) } // serveTCP starts a TCP listener for the server. diff --git a/server_test.go b/server_test.go index 5d2700bd..ad86015c 100644 --- a/server_test.go +++ b/server_test.go @@ -287,7 +287,7 @@ func TestShutdownTCP(t *testing.T) { }() time.Sleep(4e8) server.Shutdown() - time.Sleep(4e8) + time.Sleep(1e9) } func TestShutdownUDP(t *testing.T) { @@ -302,5 +302,5 @@ func TestShutdownUDP(t *testing.T) { }() time.Sleep(4e8) server.Shutdown() - time.Sleep(4e8) + time.Sleep(1e9) }