Skip to content

Commit

Permalink
chore(deps): Bumping httputils to fix cache fast exit
Browse files Browse the repository at this point in the history
Signed-off-by: Vincent Boutour <[email protected]>
  • Loading branch information
ViBiOh committed Sep 11, 2022
1 parent 2456a3e commit 5540c0a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 18 deletions.
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/ViBiOh/fibr
go 1.19

require (
github.com/ViBiOh/ChatPotte v0.2.12
github.com/ViBiOh/ChatPotte v0.2.13
github.com/ViBiOh/absto v1.0.4
github.com/ViBiOh/auth/v2 v2.14.8
github.com/ViBiOh/exas v0.5.0
github.com/ViBiOh/auth/v2 v2.14.9
github.com/ViBiOh/exas v0.5.1
github.com/ViBiOh/flags v1.2.0
github.com/ViBiOh/httputils/v4 v4.47.7
github.com/ViBiOh/vith v0.5.0
github.com/ViBiOh/httputils/v4 v4.47.8
github.com/ViBiOh/vith v0.5.1
github.com/golang/mock v1.6.0
github.com/prometheus/client_golang v1.13.0
github.com/streadway/amqp v1.0.0
Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/ViBiOh/ChatPotte v0.2.12 h1:yTfvwdIc4Z6W0tNguZdYDhQQ4m1p1nU0Bl1PAgWGDhc=
github.com/ViBiOh/ChatPotte v0.2.12/go.mod h1:3jZhDFjhP0nUoA+HIIVeXadnMT30qQfnr+vExeOFPi0=
github.com/ViBiOh/ChatPotte v0.2.13 h1:COVUL/+rG1JSaNKmFRKBGCLMPCcM8KyABsI+R11Zpq4=
github.com/ViBiOh/ChatPotte v0.2.13/go.mod h1:Dr+Edj7dpEYJD7HXst8zmAbbH3r2QCQ3bt6ivU38/7Q=
github.com/ViBiOh/absto v1.0.4 h1:j7GKLQzIyrCJUGU8Gvagse5wG5lLzJLNSSrMgVVDCnQ=
github.com/ViBiOh/absto v1.0.4/go.mod h1:+e6RyntSHivIJ3FwVL8jefGVvYkDBS5gZ5XvdqXRtT0=
github.com/ViBiOh/auth/v2 v2.14.8 h1:ix26s+ZF44wrMdhLHWa6ozVH4YFLBKqgIvTIuzTmj98=
github.com/ViBiOh/auth/v2 v2.14.8/go.mod h1:KrjZ/s3ZijLIW5RdIt9KndTxQU8d1EWNTYiV81o/Brg=
github.com/ViBiOh/exas v0.5.0 h1:ZL5v5rUOkkwo6PxhbOVe96L0RUre7SfStaVcqhE/IbU=
github.com/ViBiOh/exas v0.5.0/go.mod h1:sKRV/vz85Vj0caT+a3XWVFp0gyzXe36eZWL+XKge93E=
github.com/ViBiOh/auth/v2 v2.14.9 h1:X5uzl6uGQ+Df91KNi5n/tpEukMIkscfwuARfDn0xE8w=
github.com/ViBiOh/auth/v2 v2.14.9/go.mod h1:oqQAy3PDJic6zg+34aOs3RJds27kfxe3GgFZ0pN1mxA=
github.com/ViBiOh/exas v0.5.1 h1:W10bPVmaLs+7w3jhmn/apD71v0tRzN4h+1XkBMp8j4Y=
github.com/ViBiOh/exas v0.5.1/go.mod h1:T9fwWImuYh1wKNyJq9W2d9Qa4nwwWwHexB6QrRuYzww=
github.com/ViBiOh/flags v1.2.0 h1:DaujjNXzD29KxKyp4eZdn7c9+uBN5DokWgDAe7DcUmc=
github.com/ViBiOh/flags v1.2.0/go.mod h1:UyMB5zeD/aId7Xw3x7577ZNU298JmukzOcV8p/H2W1s=
github.com/ViBiOh/httputils/v4 v4.47.7 h1:gClQ+LkLfbUFo0FgXKR4yhid69SgM1m+6n5MD8a/3uE=
github.com/ViBiOh/httputils/v4 v4.47.7/go.mod h1:qMX3opWLo3TBnjIOL4L/IOgObQf0gGsH0uF40sYydu8=
github.com/ViBiOh/vith v0.5.0 h1:BpmjwWxd4NGmUJF12XpFOngK32539Lw3mvbMOaeOmhE=
github.com/ViBiOh/vith v0.5.0/go.mod h1:Wf40eedOBEcxeLzGzGpuO+2G8qe5Ov1WIIBPXohyKco=
github.com/ViBiOh/httputils/v4 v4.47.8 h1:+sJuLIsNsjV4QBzHuZG4mosm3KV5AynZtyVRZ/VkirY=
github.com/ViBiOh/httputils/v4 v4.47.8/go.mod h1:qMX3opWLo3TBnjIOL4L/IOgObQf0gGsH0uF40sYydu8=
github.com/ViBiOh/vith v0.5.1 h1:MpHl+mYGxhnxdUyl3GNqoFof9oONQynPcQijlPVpZwo=
github.com/ViBiOh/vith v0.5.1/go.mod h1:T7p9afXVro81yRYDsUz0KElE/b8ilPxXvtuKfQoUWy8=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
Expand Down
10 changes: 8 additions & 2 deletions pkg/exif/aggregate.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ func (a App) ListExifFor(ctx context.Context, items ...absto.Item) (map[string]e
ctx, end := tracer.StartSpan(ctx, a.tracer, "list_exif")
defer end()

exifs := a.exifCacheApp.List(ctx, onExifError, items...)
exifs, err := a.exifCacheApp.List(ctx, onExifError, items...)
if err != nil {
return nil, fmt.Errorf("list: %w", err)
}

output := make(map[string]exas.Exif, len(items))
exifsLen := len(exifs)
Expand Down Expand Up @@ -67,7 +70,10 @@ func (a App) ListAggregateFor(ctx context.Context, items ...absto.Item) (map[str
ctx, end := tracer.StartSpan(ctx, a.tracer, "list_aggregate")
defer end()

exifs := a.aggregateCacheApp.List(ctx, onAggregateError, items...)
exifs, err := a.aggregateCacheApp.List(ctx, onAggregateError, items...)
if err != nil {
return nil, fmt.Errorf("list: %w", err)
}

output := make(map[string]provider.Aggregate, len(items))
exifsLen := len(exifs)
Expand Down
7 changes: 6 additions & 1 deletion pkg/thumbnail/thumbnail.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,14 @@ func (a App) thumbnailHash(ctx context.Context, items []absto.Item) string {
ids[index] = a.PathForScale(item, SmallSize)
}

thumbnails, err := a.cacheApp.List(ctx, onCacheError, ids...)
if err != nil {
logger.Error("list thumbnails from cache: %s", err)
}

hasher := sha.Stream()

for _, thumbnail := range a.cacheApp.List(ctx, onCacheError, ids...) {
for _, thumbnail := range thumbnails {
hasher.Write(thumbnail)
}

Expand Down

0 comments on commit 5540c0a

Please sign in to comment.