diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-03-03 12:01:19 +0000 |
|---|---|---|
| committer | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-03-03 12:01:19 +0000 |
| commit | bcc27e9e1884add0ba272eaf2bb4c45a03f76e85 (patch) | |
| tree | 4c27048379b3409cce3b0024848134d43f8b4215 | |
| parent | f05ce478f05dcaf650fbae68a39aaf5d9880a580 (diff) | |
Only store notifications for users with pushers, de-parallelise `TestSessionCleanUp` for now
| -rw-r--r-- | clientapi/routing/register_test.go | 8 | ||||
| -rw-r--r-- | userapi/consumers/syncapi_streamevent.go | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/clientapi/routing/register_test.go b/clientapi/routing/register_test.go index 520f5dde..46bae697 100644 --- a/clientapi/routing/register_test.go +++ b/clientapi/routing/register_test.go @@ -214,7 +214,7 @@ func TestSessionCleanUp(t *testing.T) { s := newSessionsDict() t.Run("session is cleaned up after a while", func(t *testing.T) { - t.Parallel() + // t.Parallel() dummySession := "helloWorld" // manually added, as s.addParams() would start the timer with the default timeout s.params[dummySession] = registerRequest{Username: "Testing"} @@ -226,7 +226,7 @@ func TestSessionCleanUp(t *testing.T) { }) t.Run("session is deleted, once the registration completed", func(t *testing.T) { - t.Parallel() + // t.Parallel() dummySession := "helloWorld2" s.startTimer(time.Minute, dummySession) s.deleteSession(dummySession) @@ -236,7 +236,7 @@ func TestSessionCleanUp(t *testing.T) { }) t.Run("session timer is restarted after second call", func(t *testing.T) { - t.Parallel() + // t.Parallel() dummySession := "helloWorld3" // the following will start a timer with the default timeout of 5min s.addParams(dummySession, registerRequest{Username: "Testing"}) @@ -260,4 +260,4 @@ func TestSessionCleanUp(t *testing.T) { t.Error("expected session to device to be delete") } }) -}
\ No newline at end of file +} diff --git a/userapi/consumers/syncapi_streamevent.go b/userapi/consumers/syncapi_streamevent.go index 11081327..d86078cb 100644 --- a/userapi/consumers/syncapi_streamevent.go +++ b/userapi/consumers/syncapi_streamevent.go @@ -139,6 +139,9 @@ func (s *OutputStreamEventConsumer) processMessage(ctx context.Context, event *g // removing it means we can send all notifications to // e.g. Element's Push gateway in one go. for _, mem := range members { + if p, err := s.db.GetPushers(ctx, mem.Localpart); err != nil || len(p) == 0 { + continue + } if err := s.notifyLocal(ctx, event, pos, mem, roomSize, roomName); err != nil { log.WithFields(log.Fields{ "localpart": mem.Localpart, |