mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 03:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try to drain the channel, if possible

Browse source
This commit is contained in:
Till Faelligen 2022-02-24 13:17:06 +01:00
parent 55951e2d72
commit 8b6d3cb35f
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clientapi/routing/register.go
View file

@ -117,8 +117,12 @@ func (d *sessionsDict) deleteSession(sessionID string) {
delete(d.sessions, sessionID) delete(d.sessions, sessionID)
// stop the timer, e.g. because the registration was completed // stop the timer, e.g. because the registration was completed
if t, ok := d.timer[sessionID]; ok { if t, ok := d.timer[sessionID]; ok {
// trying to drain the channel results in a deadlock? if !t.Stop() {
t.Stop() select {
case <-t.C:
default:
}
}
delete(d.timer, sessionID) delete(d.timer, sessionID)
} }
} }