PenaSide/common
3
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

remove mongo host port

Browse Source
This commit is contained in:
Pasha 2024-11-28 17:49:32 +03:00
parent cf56ae1e3f
commit b14c114d25
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mongo/config.go
View File

@ -7,8 +7,7 @@ import (
) )
type Configuration struct { type Configuration struct {
Host string `env:"MONGO_HOST,default=localhost"` URL string `env:"MONGO_URL,required"`
Port string `env:"MONGO_PORT,default=27017"`
User string `env:"MONGO_USER,required"` User string `env:"MONGO_USER,required"`
Password string `env:"MONGO_PASSWORD,required"` Password string `env:"MONGO_PASSWORD,required"`
Auth string `env:"MONGO_AUTH,required"` Auth string `env:"MONGO_AUTH,required"`

15
mongo/connection.go
View File

@ -5,8 +5,6 @@ import (
"fmt" "fmt"
"go.mongodb.org/mongo-driver/event" "go.mongodb.org/mongo-driver/event"
"log" "log"
"net"
"net/url"
"time" "time"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
@ -23,11 +21,6 @@ func Connect(ctx context.Context, deps *ConnectDeps) (*mongo.Database, error) {
return nil, ErrEmptyArgs return nil, ErrEmptyArgs
} }
mongoURI := &url.URL{
Scheme: "mongodb",
Host: net.JoinHostPort(deps.Configuration.Host, deps.Configuration.Port),
}
cmdMonitor := &event.CommandMonitor{ cmdMonitor := &event.CommandMonitor{
Started: func(_ context.Context, evt *event.CommandStartedEvent) { Started: func(_ context.Context, evt *event.CommandStartedEvent) {
if evt.CommandName == "find" { if evt.CommandName == "find" {
@ -47,7 +40,7 @@ func Connect(ctx context.Context, deps *ConnectDeps) (*mongo.Database, error) {
} }
connectionOptions := options.Client(). connectionOptions := options.Client().
ApplyURI(mongoURI.String()). ApplyURI(deps.Configuration.URL).
SetAuth(options.Credential{ SetAuth(options.Credential{
AuthMechanism: "SCRAM-SHA-1", AuthMechanism: "SCRAM-SHA-1",
AuthSource: deps.Configuration.Auth, AuthSource: deps.Configuration.Auth,
@ -70,12 +63,12 @@ func Connect(ctx context.Context, deps *ConnectDeps) (*mongo.Database, error) {
if err == nil { if err == nil {
return connection.Database(deps.Configuration.DatabaseName), nil return connection.Database(deps.Configuration.DatabaseName), nil
} }
log.Printf("failed to ping the database <%s>: %s", mongoURI.String(), err.Error()) log.Printf("failed to ping the database <%s>: %s", deps.Configuration.URL, err.Error())
} }
log.Printf("failed to connect to db <%s>: %s", mongoURI.String(), err.Error()) log.Printf("failed to connect to db <%s>: %s", deps.Configuration.URL, err.Error())
case <-timeoutExceeded: case <-timeoutExceeded:
return nil, fmt.Errorf("db connection <%s> failed after %d timeout", mongoURI.String(), deps.Timeout) return nil, fmt.Errorf("db connection <%s> failed after %d timeout", deps.Configuration.URL, deps.Timeout)
default: default:
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} }