From 427b09dc4784c90e3c1a5a40d8e5f9c75dbddf06 Mon Sep 17 00:00:00 2001
From: user <mantianyu@gmail.com>
Date: Tue, 12 Jul 2022 01:08:01 +0800
Subject: [PATCH] merge back from official

---
 node/rpcstack.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/node/rpcstack.go b/node/rpcstack.go
index 7901d37ebe..09490aa28a 100644
--- a/node/rpcstack.go
+++ b/node/rpcstack.go
@@ -269,8 +269,9 @@ func (h *httpServer) doStop() {
 	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)
+	if err == ctx.Err() {
+		h.log.Warn("HTTP server graceful shutdown timed out")
+		h.server.Close()
 	}
 	h.listener.Close()
 	h.log.Info("HTTP server stopped", "endpoint", h.listener.Addr())