foomo/keel
1
0
Fork 0
mirror of https://github.com/foomo/keel.git synced 2025-10-16 12:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: use background context

Browse Source
This commit is contained in:
franklin 2023-02-23 09:40:18 +01:00
parent ad6df3c12a
commit e8d7c6c731
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
persistence/mongo/collection.go
View File

@ -355,9 +355,12 @@ func (c *Collection) Find(ctx context.Context, filter, results interface{}, opts
} else if err != nil {
return err
}
defer CloseCursor(ctx, cursor, &err)
err = cursor.All(ctx, results)
return err
if err = cursor.All(ctx, results); err != nil {
return err
}
return cursor.Err()
}
func (c *Collection) FindOne(ctx context.Context, filter, result interface{}, opts ...*options.FindOneOptions) error {
@ -367,6 +370,7 @@ func (c *Collection) FindOne(ctx context.Context, filter, result interface{}, op
} else if res.Err() != nil {
return res.Err()
}
return res.Decode(result)
}
@ -377,13 +381,16 @@ func (c *Collection) FindIterate(ctx context.Context, filter interface{}, handle
} else if err != nil {
return err
}
defer CloseCursor(ctx, cursor, &err)
defer CloseCursor(cursor)
for cursor.Next(ctx) {
if err := handler(cursor.Decode); err != nil {
return err
}
}
return err
return cursor.Err()
}
func (c *Collection) Aggregate(ctx context.Context, pipeline mongo.Pipeline, results interface{}, opts ...*options.AggregateOptions) error {
@ -391,9 +398,12 @@ func (c *Collection) Aggregate(ctx context.Context, pipeline mongo.Pipeline, res
if err != nil {
return err
}
defer CloseCursor(ctx, cursor, &err)
err = cursor.All(ctx, results)
return err
if err = cursor.All(ctx, results); err != nil {
return err
}
return cursor.Err()
}
func (c *Collection) AggregateIterate(ctx context.Context, pipeline mongo.Pipeline, handler IterateHandlerFn, opts ...*options.AggregateOptions) error {
@ -401,13 +411,16 @@ func (c *Collection) AggregateIterate(ctx context.Context, pipeline mongo.Pipeli
if err != nil {
return err
}
defer CloseCursor(ctx, cursor, &err)
defer CloseCursor(cursor)
for cursor.Next(ctx) {
if err := handler(cursor.Decode); err != nil {
return err
}
}
return nil
return cursor.Err()
}
// Count returns the count of documents

8
persistence/mongo/utils.go
View File

@ -3,13 +3,13 @@ package keelmongo
import (
"context"
"github.com/foomo/keel/log"
"go.mongodb.org/mongo-driver/mongo"
)
// CloseCursor with defer
func CloseCursor(ctx context.Context, cursor *mongo.Cursor, err *error) {
cErr := cursor.Close(ctx)
if *err == nil {
*err = cErr
func CloseCursor(cursor *mongo.Cursor) {
if err := cursor.Close(context.Background()); err != nil {
log.WithError(nil, err).Error("failed to close cursor")
}
}