mirror of https://github.com/cloudreve/Cloudreve
fix(thumb): thumb queue retry setting not working (#2367)
parent
0a28bf1689
commit
5d72faf688
2
assets
2
assets
|
@ -1 +1 @@
|
|||
Subproject commit f1c048ec0bad39fc774ca017564eadc96da773cb
|
||||
Subproject commit c4d4d3aa6f28e04a5828f3b4b4453d239746bed0
|
|
@ -260,21 +260,20 @@ func newGenerateThumbTask(ctx context.Context, m *manager, uri *fs.URI, ext stri
|
|||
}
|
||||
|
||||
func (m *GenerateThumbTask) Do(ctx context.Context) (task.Status, error) {
|
||||
var (
|
||||
res fs.Entity
|
||||
err error
|
||||
)
|
||||
defer func() { m.sig <- &generateRes{res, err} }()
|
||||
|
||||
// Make sure user does not cancel request before we start generating thumb.
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
err = ctx.Err()
|
||||
err := ctx.Err()
|
||||
return task.StatusError, err
|
||||
default:
|
||||
}
|
||||
|
||||
res, err = m.m.generateThumb(ctx, m.uri, m.ext, m.es)
|
||||
res, err := m.m.generateThumb(ctx, m.uri, m.ext, m.es)
|
||||
if err != nil {
|
||||
return task.StatusError, err
|
||||
}
|
||||
|
||||
m.sig <- &generateRes{res, nil}
|
||||
return task.StatusCompleted, nil
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue