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

fix(GODT-2949): Fix close of close channel in event service

Browse Source 
This issue is triggered due to the `Service.Close()` call after the
go-routine for the event service exists. It is possible that during this
period a recently added subscriber with `pendingOpAdd` gets cancelled
and closed.

However, the subscriber later also enqueues a `pendingOpRemove` which
gets processed again with a call in `user.eventService.Close()` leading
to the double close panic.

This patch simply removes the `s.Close()` from the service, and leaves
the cleanup to called externally from user.Close() or user.Logout().
This commit is contained in:
Leander Beernaert
2023-09-26 09:08:25 +02:00
parent 45d2e9ea63
commit e6b312b437
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/services/userevents/service.go
View File

@ -192,7 +192,6 @@ func (s *Service) run(ctx context.Context, lastEventID string) {
defer s.cpc.Close() defer s.cpc.Close()
defer s.timer.Stop() defer s.timer.Stop()
defer s.log.Info("Exiting service") defer s.log.Info("Exiting service")
defer s.Close()
client := network.NewClientRetryWrapper(s.eventSource, &network.ExpCoolDown{}) client := network.NewClientRetryWrapper(s.eventSource, &network.ExpCoolDown{})
@ -303,14 +302,15 @@ func (s *Service) Close() {
// Cleanup pending removes. // Cleanup pending removes.
for _, s := range s.pendingSubscriptions { for _, s := range s.pendingSubscriptions {
if s.op == pendingOpRemove { if !processed.Contains(s.sub) {
if !processed.Contains(s.sub) { processed.Add(s.sub)
if s.op == pendingOpRemove {
s.sub.close()
} else {
s.sub.cancel()
s.sub.close() s.sub.close()
} }
} else {
s.sub.cancel()
s.sub.close()
processed.Add(s.sub)
} }
} }