Pass in an ErrorLog to http.Server (#5135)

Fixes #5108
hashicorp · Aug 21, 2018 · 1820110 · 1820110
1 parent 224587d
commit 1820110
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/command/server.go b/command/server.go
@@ -979,6 +979,7 @@ CLUSTER_SYNTHESIS_COMPLETE:
 			ReadHeaderTimeout: 10 * time.Second,
 			ReadTimeout:       30 * time.Second,
 			IdleTimeout:       5 * time.Minute,
+			ErrorLog:          c.logger.StandardLogger(nil),
 		}
 		go server.Serve(ln.Listener)
 	}

diff --git a/http/testing.go b/http/testing.go
@@ -33,8 +33,9 @@ func TestServerWithListenerAndProperties(tb testing.TB, ln net.Listener, addr st
 	mux.Handle("/", Handler(props))
 
 	server := &http.Server{
-		Addr:    ln.Addr().String(),
-		Handler: mux,
+		Addr:     ln.Addr().String(),
+		Handler:  mux,
+		ErrorLog: core.Logger().StandardLogger(nil),
 	}
 	go server.Serve(ln)
 }

diff --git a/vault/request_forwarding.go b/vault/request_forwarding.go
@@ -211,6 +211,9 @@ func (c *Core) startForwarding(ctx context.Context) error {
 					go func() {
 						fws.ServeConn(tlsConn, &http2.ServeConnOpts{
 							Handler: fwRPCServer,
+							BaseConfig: &http.Server{
+								ErrorLog: c.logger.StandardLogger(nil),
+							},
 						})
 						// close the quitCh which will close the connection and
 						// the other goroutine.

diff --git a/vault/testing.go b/vault/testing.go
@@ -1110,7 +1110,8 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 		var handler http.Handler = http.NewServeMux()
 		handlers = append(handlers, handler)
 		server := &http.Server{
-			Handler: handler,
+			Handler:  handler,
+			ErrorLog: logger.StandardLogger(nil),
 		}
 		servers = append(servers, server)
 	}