services/rpcsrv: Fix potential shutdown deadlock of RPC server
Previously RPC server could never be shut down completely due to some start precondition failure (in particular, inability to serve HTTP on any configured endpoint). The problem was caused by next facts: * start method ran subscription routine after HTTP init succeeded only * stop method blocked waiting for the subscription routine to return Run `handleSubEvents` routine on fresh `Start` unconditionally. With this change, `Shutdown` method won't produce deadlock since `handleSubEvents` closes wait channel. Refs #2896. Signed-off-by: Leonard Lyubich <leonard@morphbits.io>
This commit is contained in:
parent
758c455c7e
commit
f8227aa5f7
1 changed files with 3 additions and 1 deletions
|
@ -344,6 +344,9 @@ func (s *Server) Start() {
|
|||
s.log.Info("RPC server already started")
|
||||
return
|
||||
}
|
||||
|
||||
go s.handleSubEvents()
|
||||
|
||||
for _, srv := range s.http {
|
||||
srv.Handler = http.HandlerFunc(s.handleHTTPRequest)
|
||||
s.log.Info("starting rpc-server", zap.String("endpoint", srv.Addr))
|
||||
|
@ -363,7 +366,6 @@ func (s *Server) Start() {
|
|||
}(srv)
|
||||
}
|
||||
|
||||
go s.handleSubEvents()
|
||||
if cfg := s.config.TLSConfig; cfg.Enabled {
|
||||
for _, srv := range s.https {
|
||||
srv.Handler = http.HandlerFunc(s.handleHTTPRequest)
|
||||
|
|
Loading…
Reference in a new issue