third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-06-01 16:11:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add log warn when request is cancelled/interrupted

Browse Source
This commit is contained in:
Deluan 2022-07-27 14:27:18 -04:00
parent cd5bce7b16
commit c0066ebd85
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/subsonic/api.go
View File

@ -192,6 +192,10 @@ func h(r chi.Router, path string, f handler) {
sendError(w, r, err) sendError(w, r, err)
return return
} }
if r.Context().Err() != nil {
log.Warn("Request was interrupted", "path", path, r.Context().Err())
return
}
if res != nil { if res != nil {
sendResponse(w, r, res) sendResponse(w, r, res)
} }

14
server/subsonic/searching.go
View File

@ -60,10 +60,14 @@ func doSearch[T any](ctx context.Context, wg *sync.WaitGroup, s searchFunc[T], q
} }
done := make(chan struct{}) done := make(chan struct{})
go func() { go func() {
typ := reflect.TypeOf(res).String()
var err error var err error
start := time.Now()
res, err = s(q, offset, size) res, err = s(q, offset, size)
if err != nil { if err != nil {
log.Error(ctx, "Error searching "+reflect.TypeOf(res).String(), err) log.Error(ctx, "Error searching "+typ, err)
} else {
log.Trace(ctx, "Search for "+typ+" completed", "elapsedTime", time.Since(start))
} }
done <- struct{}{} done <- struct{}{}
}() }()
@ -85,8 +89,12 @@ func (c *SearchingController) searchAll(r *http.Request, sp *searchParams) (medi
go func() { artists = doSearch(ctx, wg, c.ds.Artist(ctx).Search, q, sp.artistOffset, sp.artistCount) }() go func() { artists = doSearch(ctx, wg, c.ds.Artist(ctx).Search, q, sp.artistOffset, sp.artistCount) }()
wg.Wait() wg.Wait()
log.Debug(ctx, fmt.Sprintf("Search resulted in %d songs, %d albums and %d artists", if ctx.Err() == nil {
len(mediaFiles), len(albums), len(artists)), "query", sp.query, "elapsedTime", time.Since(start)) log.Debug(ctx, fmt.Sprintf("Search resulted in %d songs, %d albums and %d artists",
len(mediaFiles), len(albums), len(artists)), "query", sp.query, "elapsedTime", time.Since(start))
} else {
log.Warn(ctx, "Search was interrupted", ctx.Err(), "query", sp.query, "elapsedTime", time.Since(start))
}
return mediaFiles, albums, artists return mediaFiles, albums, artists
} }