From: Tom Clegg <tom@tomclegg.ca>
Date: Thu, 5 Mar 2020 18:12:52 +0000 (-0500)
Subject: 16217: Close http server before closing listener when shutting down.
X-Git-Tag: 2.1.0~271^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/66d3a26aa1f5fbbdcacdd332a56447fd8afd889f

16217: Close http server before closing listener when shutting down.

Changes log message from "accept tcp ...: use of closed network
connection" to "http: Server closed".

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

diff --git a/services/ws/server.go b/services/ws/server.go
index 3fb59732ed..9747ea1b85 100644
--- a/services/ws/server.go
+++ b/services/ws/server.go
@@ -25,6 +25,7 @@ type server struct {
 func (srv *server) Close() {
 	srv.WaitReady()
 	srv.eventSource.Close()
+	srv.httpServer.Close()
 	srv.listener.Close()
 }