forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-10 05:53:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #35 from DeBankDeFi/rpc-shutdown-with-timeout

Browse source 
rpc graceful shutdown timeout - merge back from upstream repo
This commit is contained in:
Brion 2022-07-12 01:18:05 +08:00 committed by GitHub
commit c3f82a6595
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
node/rpcstack.go
View file

@ -269,8 +269,9 @@ func (h *httpServer) doStop() {
ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout) ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
defer cancel() defer cancel()
err := h.server.Shutdown(ctx) err := h.server.Shutdown(ctx)
if err != nil { if err == ctx.Err() {
h.log.Warn("Something wrong with HTTP server graceful shutdown", "error", err) h.log.Warn("HTTP server graceful shutdown timed out")
h.server.Close()
} }
h.listener.Close() h.listener.Close()
h.log.Info("HTTP server stopped", "endpoint", h.listener.Addr()) h.log.Info("HTTP server stopped", "endpoint", h.listener.Addr())