mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 20:47:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Disconnect the client if the output buffer fills up

Browse source
This commit is contained in:
Deluan 2020-12-12 18:26:30 -05:00
parent 17833cd9d2
commit 8b92796a5c
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scanner/scanner.go
View file

@ -161,7 +161,7 @@ func (s *scanner) RescanAll(ctx context.Context, fullRescan bool) error {
return ErrAlreadyScanning
}
isScanning.Set(true)
defer func() { isScanning.Set(false) }()
defer isScanning.Set(false)
defer s.cacheWarmer.Flush(context.Background())
var hasError bool

17
server/events/sse.go
View file

@ -36,6 +36,7 @@ type (
username string
userAgent string
channel messageChan
done chan struct{}
}
)
@ -124,9 +125,12 @@ func (b *broker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Flush the data immediately instead of buffering it for later.
flusher.Flush()
case <-ctx.Done():
case <-c.done:
log.Trace(ctx, "Closing event stream connection", "client", c.String())
return
case <-ctx.Done():
log.Trace(ctx, "Client closed the connection", "client", c.String())
return
}
}
}
@ -176,13 +180,14 @@ func (b *broker) listen() {
case event := <-b.publish:
// We got a new event from the outside!
// Send event to all connected clients
for client := range b.clients {
log.Trace("Putting event on client's queue", "client", client.String(), "event", event)
// Use non-blocking send
for c := range b.clients {
log.Trace("Putting event on client's queue", "client", c.String(), "event", event)
// Use non-blocking send. If cannot send, terminate the client's connection
select {
case client.channel <- event:
case c.channel <- event:
default:
log.Warn("Could not send message to client", "client", client.String(), "event", event)
log.Warn("Could not send message to client", "client", c.String(), "event", event)
c.done <- struct{}{}
}
}