16217: Close http server before closing listener when shutting down.
authorTom Clegg <tom@tomclegg.ca>
Thu, 5 Mar 2020 18:12:52 +0000 (13:12 -0500)
committerTom Clegg <tom@tomclegg.ca>
Thu, 5 Mar 2020 18:12:52 +0000 (13:12 -0500)
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>

services/ws/server.go

index 3fb59732ed9e5feb4e38f48685a970a7a5ab6425..9747ea1b857074f9ab4616cad0af9ad274232827 100644 (file)
@@ -25,6 +25,7 @@ type server struct {
 func (srv *server) Close() {
        srv.WaitReady()
        srv.eventSource.Close()
+       srv.httpServer.Close()
        srv.listener.Close()
 }