github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-03 00:38:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix collection breaker (#537)

Browse Source 
* fix collection breaker

* optimized

* optimized

* optimized
This commit is contained in:
kingxt 2021-03-03 10:44:29 +08:00 committed by GitHub
parent f01472c9ea
commit a25cba5380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/stores/mongo/collection.go
View File

@ -43,11 +43,11 @@ type (
} }
) )
func newCollection(collection *mgo.Collection) Collection { func newCollection(collection *mgo.Collection, brk breaker.Breaker) Collection {
return &decoratedCollection{ return &decoratedCollection{
name: collection.FullName, name: collection.FullName,
collection: collection, collection: collection,
brk: breaker.NewBreaker(), brk: brk,
} }
} }

2
core/stores/mongo/collection_test.go
View File

@ -71,7 +71,7 @@ func TestNewCollection(t *testing.T) {
Database: nil, Database: nil,
Name: "foo", Name: "foo",
FullName: "bar", FullName: "bar",
}) }, breaker.GetBreaker("localhost"))
assert.Equal(t, "bar", col.(*decoratedCollection).name) assert.Equal(t, "bar", col.(*decoratedCollection).name)
} }

5
core/stores/mongo/model.go
View File

@ -5,6 +5,7 @@ import (
"time" "time"
"github.com/globalsign/mgo" "github.com/globalsign/mgo"
"github.com/tal-tech/go-zero/core/breaker"
) )
type ( type (
@ -20,6 +21,7 @@ type (
session *concurrentSession session *concurrentSession
db *mgo.Database db *mgo.Database
collection string collection string
brk breaker.Breaker
opts []Option opts []Option
} }
) )
@ -46,6 +48,7 @@ func NewModel(url, collection string, opts ...Option) (*Model, error) {
// If name is empty, the database name provided in the dialed URL is used instead // If name is empty, the database name provided in the dialed URL is used instead
db: session.DB(""), db: session.DB(""),
collection: collection, collection: collection,
brk: breaker.GetBreaker(url),
opts: opts, opts: opts,
}, nil }, nil
} }
@ -66,7 +69,7 @@ func (mm *Model) FindId(id interface{}) (Query, error) {
// GetCollection returns a Collection with given session. // GetCollection returns a Collection with given session.
func (mm *Model) GetCollection(session *mgo.Session) Collection { func (mm *Model) GetCollection(session *mgo.Session) Collection {
return newCollection(mm.db.C(mm.collection).With(session)) return newCollection(mm.db.C(mm.collection).With(session), mm.brk)
} }
// Insert inserts docs into mm. // Insert inserts docs into mm.