forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-28 07:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

impose time limit for rpc shutdown in case it hangs over in edge cases

Browse source
This commit is contained in:
user 2022-07-06 19:36:55 +08:00
parent d8f4c595d4
commit 3230fa3a01
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
node/rpcstack.go
View file

@ -27,6 +27,7 @@ import (
"strings"
"sync"
"sync/atomic"
"time"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rpc"
@ -81,6 +82,10 @@ type httpServer struct {
handlerNames map[string]string
}
const (
shutdownTimeout = 5 * time.Second
)
func newHTTPServer(log log.Logger, timeouts rpc.HTTPTimeouts) *httpServer {
h := &httpServer{log: log, timeouts: timeouts, handlerNames: make(map[string]string)}
@ -261,7 +266,12 @@ func (h *httpServer) doStop() {
h.wsHandler.Store((*rpcHandler)(nil))
wsHandler.server.Stop()
}
h.server.Shutdown(context.Background())
ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
defer cancel()
err := h.server.Shutdown(ctx)
if err != nil {
h.log.Warn("Something wrong with HTTP server graceful shutdown", "error", err)
}
h.listener.Close()
h.log.Info("HTTP server stopped", "endpoint", h.listener.Addr())