yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Clean up gRPC shutdown goroutine

Browse Source
This commit is contained in:
James Houlahan
2022-11-22 14:52:01 +01:00
committed by Leander Beernaert
parent 7cb9d62f0c
commit 1375f42869
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/frontend/grpc/service.go
View File

@ -197,13 +197,20 @@ func (s *Service) Loop() error {
s.log.Info("Starting gRPC server") s.log.Info("Starting gRPC server")
go func() { doneCh := make(chan struct{})
<-s.quitCh defer close(doneCh)
go func() {
select {
case <-s.quitCh:
s.log.Info("Stopping gRPC server") s.log.Info("Stopping gRPC server")
defer s.log.Info("Stopped gRPC server") defer s.log.Info("Stopped gRPC server")
s.grpcServer.Stop() s.grpcServer.Stop()
case <-doneCh:
// ...
}
}() }()
if err := s.grpcServer.Serve(s.listener); err != nil { if err := s.grpcServer.Serve(s.listener); err != nil {
@ -279,14 +286,12 @@ func (s *Service) watchEvents() {
_ = s.SendEvent(NewUserChangedEvent(event.UserID)) _ = s.SendEvent(NewUserChangedEvent(event.UserID))
case events.UserDeauth: case events.UserDeauth:
if user, err := s.bridge.GetUserInfo(event.UserID); err != nil {
s.log.WithError(err).Error("Failed to get user info")
} else {
// The GUI doesn't care about this event... not sure why we still emit it.
_ = s.SendEvent(NewUserDisconnectedEvent(user.Username))
// This is the event the GUI cares about. // This is the event the GUI cares about.
_ = s.SendEvent(NewUserChangedEvent(user.UserID)) _ = s.SendEvent(NewUserChangedEvent(event.UserID))
// The GUI doesn't care about this event... not sure why we still emit it.
if user, err := s.bridge.GetUserInfo(event.UserID); err == nil {
_ = s.SendEvent(NewUserDisconnectedEvent(user.Username))
} }
case events.UpdateLatest: case events.UpdateLatest: