ayo/gocommon
8
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

mongo dbname도 url에서 받음

Browse Source
This commit is contained in:
mountain
2023-09-01 10:42:15 +09:00
parent 9e9d91b5a3
commit 68e40d580f
2 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mongo.go
View File

@ -15,6 +15,7 @@ import (
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/mongo/readpref" "go.mongodb.org/mongo-driver/mongo/readpref"
"go.mongodb.org/mongo-driver/x/mongo/driver/connstring"
) )
type MongoClient struct { type MongoClient struct {
@ -60,8 +61,19 @@ func (ci *ConnectionInfo) SetDatabase(dbname string) *ConnectionInfo {
return ci return ci
} }
func NewMongoClient(ctx context.Context, url string, dbname string) (MongoClient, error) { var errNoDatabaseNameInMongoUri = errors.New("mongo uri has no database name")
return newMongoClient(ctx, NewMongoConnectionInfo(url, dbname))
func NewMongoClient(ctx context.Context, url string) (MongoClient, error) {
connstr, err := connstring.ParseAndValidate(url)
if err != nil {
return MongoClient{}, err
}
if len(connstr.Database) == 0 {
return MongoClient{}, errNoDatabaseNameInMongoUri
}
return newMongoClient(ctx, NewMongoConnectionInfo(url, connstr.Database))
} }
func newMongoClient(ctx context.Context, ci *ConnectionInfo) (MongoClient, error) { func newMongoClient(ctx context.Context, ci *ConnectionInfo) (MongoClient, error) {

25
session/impl_mongo.go
View File

@ -2,14 +2,12 @@ package session
import ( import (
"context" "context"
"errors"
"time" "time"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/x/mongo/driver/connstring"
"repositories.action2quare.com/ayo/gocommon" "repositories.action2quare.com/ayo/gocommon"
"repositories.action2quare.com/ayo/gocommon/logger" "repositories.action2quare.com/ayo/gocommon/logger"
) )
@ -25,18 +23,8 @@ type sessionMongo struct {
Ts primitive.DateTime `bson:"_ts"` Ts primitive.DateTime `bson:"_ts"`
} }
var errNoDatabaseNameInMongoUri = errors.New("mongo uri has no database name")
func newProviderWithMongo(ctx context.Context, mongoUrl string, ttl time.Duration) (Provider, error) { func newProviderWithMongo(ctx context.Context, mongoUrl string, ttl time.Duration) (Provider, error) {
connstr, err := connstring.ParseAndValidate(mongoUrl) mc, err := gocommon.NewMongoClient(ctx, mongoUrl)
if err != nil {
return nil, err
}
if len(connstr.Database) == 0 {
return nil, errNoDatabaseNameInMongoUri
}
mc, err := gocommon.NewMongoClient(ctx, mongoUrl, connstr.Database)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -105,16 +93,7 @@ type sessionPipelineDocument struct {
} }
func newConsumerWithMongo(ctx context.Context, mongoUrl string, ttl time.Duration) (Consumer, error) { func newConsumerWithMongo(ctx context.Context, mongoUrl string, ttl time.Duration) (Consumer, error) {
connstr, err := connstring.ParseAndValidate(mongoUrl) mc, err := gocommon.NewMongoClient(ctx, mongoUrl)
if err != nil {
return nil, err
}
if len(connstr.Database) == 0 {
return nil, errNoDatabaseNameInMongoUri
}
mc, err := gocommon.NewMongoClient(ctx, mongoUrl, connstr.Database)
if err != nil { if err != nil {
return nil, err return nil, err
} }