Merge pull request #741 from oasisprotocol/ptrus/bugfix/shutdown-panic

ptrus · web-flow · commit 3255205fe54b · 2025-06-04T08:47:27.000+02:00
fix: Potential panic during shutdown
diff --git a/server/server.go b/server/server.go
@@ -254,8 +254,12 @@ func (srv *Web3Gateway) startRPC() error {
 }
 
 func (srv *Web3Gateway) stopRPC() {
-	srv.http.stop()
-	srv.ws.stop()
+	if srv.http != nil {
+		srv.http.stop()
+	}
+	if srv.ws != nil {
+		srv.ws.stop()
+	}
 }
 
 // Wait blocks until the server is closed.

Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,12 @@ func (srv *Web3Gateway) startRPC() error {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`func (srv *Web3Gateway) stopRPC() {`
`257`		`- srv.http.stop()`
`258`		`- srv.ws.stop()`
	`257`	`+ if srv.http != nil {`
	`258`	`+ srv.http.stop()`
	`259`	`+ }`
	`260`	`+ if srv.ws != nil {`
	`261`	`+ srv.ws.stop()`
	`262`	`+ }`
`259`	`263`	`}`
`260`	`264`
`261`	`265`	`// Wait blocks until the server is closed.`