Skip to content

Commit

Permalink
Hold the event source when there are no listeners (#15725)
Browse files Browse the repository at this point in the history
* Hold the event source when there are no listeners

The event source does not need to run when there are no listeners. Therefore
pause it when there are none.

* add some more logging

Signed-off-by: Andrew Thornton <art27@cantab.net>
  • Loading branch information
zeripath authored May 15, 2021
1 parent f582ec4 commit 8e32eeb
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
6 changes: 6 additions & 0 deletions modules/eventsource/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ type Manager struct {
mutex sync.Mutex

messengers map[int64]*Messenger
connection chan struct{}
}

var manager *Manager

func init() {
manager = &Manager{
messengers: make(map[int64]*Messenger),
connection: make(chan struct{}, 1),
}
}

Expand All @@ -36,6 +38,10 @@ func (m *Manager) Register(uid int64) <-chan *Event {
messenger = NewMessenger(uid)
m.messengers[uid] = messenger
}
select {
case m.connection <- struct{}{}:
default:
}
m.mutex.Unlock()
return messenger.Register()
}
Expand Down
29 changes: 29 additions & 0 deletions modules/eventsource/manager_run.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,35 @@ loop:
timer.Stop()
break loop
case <-timer.C:
m.mutex.Lock()
connectionCount := len(m.messengers)
if connectionCount == 0 {
log.Trace("Event source has no listeners")
// empty the connection channel
select {
case <-m.connection:
default:
}
}
m.mutex.Unlock()
if connectionCount == 0 {
// No listeners so the source can be paused
log.Trace("Pausing the eventsource")
select {
case <-ctx.Done():
break loop
case <-m.connection:
log.Trace("Connection detected - restarting the eventsource")
// OK we're back so lets reset the timer and start again
// We won't change the "then" time because there could be concurrency issues
select {
case <-timer.C:
default:
}
continue
}
}

now := timeutil.TimeStampNow().Add(-2)

uidCounts, err := models.GetUIDsAndNotificationCounts(then, now)
Expand Down

0 comments on commit 8e32eeb

Please sign in to comment.