aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

rpc/server: only log errors during Shutdown

Browse source 
Sending them down the errChan is not really helpful and it can lead to
deadlock. If an error happens during node shutdown, we're exiting anyway, if
it happens during service restart, the old server will be dead irrespective of
this error (if this affects new one in any way we'll know it soon).
This commit is contained in:
Roman Khimov 2022-04-26 00:13:13 +03:00
parent 53423b7c37
commit a2126b92e1
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkg/rpc/server/server.go
View file

@ -258,8 +258,6 @@ func (s *Server) Start() {
// Shutdown stops the RPC server. It can only be called once. // Shutdown stops the RPC server. It can only be called once.
func (s *Server) Shutdown() { func (s *Server) Shutdown() {
var httpsErr error
if !s.started.Load() { if !s.started.Load() {
return return
} }
@ -268,21 +266,20 @@ func (s *Server) Shutdown() {
if s.config.TLSConfig.Enabled { if s.config.TLSConfig.Enabled {
s.log.Info("shutting down RPC server (https)", zap.String("endpoint", s.https.Addr)) s.log.Info("shutting down RPC server (https)", zap.String("endpoint", s.https.Addr))
httpsErr = s.https.Shutdown(context.Background()) err := s.https.Shutdown(context.Background())
if err != nil {
s.log.Warn("error during RPC (https) server shutdown", zap.Error(err))
}
} }
s.log.Info("shutting down RPC server", zap.String("endpoint", s.Addr)) s.log.Info("shutting down RPC server", zap.String("endpoint", s.Addr))
err := s.Server.Shutdown(context.Background()) err := s.Server.Shutdown(context.Background())
if err != nil {
s.log.Warn("error during RPC (http) server shutdown", zap.Error(err))
}
// Wait for handleSubEvents to finish. // Wait for handleSubEvents to finish.
<-s.executionCh <-s.executionCh
if httpsErr != nil {
s.errChan <- httpsErr
}
if err != nil {
s.errChan <- err
}
} }
func (s *Server) handleHTTPRequest(w http.ResponseWriter, httpRequest *http.Request) { func (s *Server) handleHTTPRequest(w http.ResponseWriter, httpRequest *http.Request) {