core/deprecated-oc-catalog
6
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Modified the conf loading process, now with onion in conf/conf.go

Browse Source
This commit is contained in:
pb
2023-10-31 11:23:39 +01:00
parent 1806624e76
commit 17f0998ffb
5 changed files with 78 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/init.go
View File

@@ -13,6 +13,7 @@ func Init() {
var DBpoint string
var err error
DBpoint = os.Getenv("DOCKER_DBPOINT")
if len(DBpoint) == 0 {
DBpoint, err = beego.AppConfig.String("DBPOINT")

49
services/mongo.go
View File

@@ -2,11 +2,10 @@ package services
import (
"context"
"os"
"time"
"cloud.o-forge.io/core/oc-catalog/conf"
"github.com/beego/beego/v2/core/logs"
beego "github.com/beego/beego/v2/server/web"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
@@ -56,40 +55,46 @@ func MongoDisconnect() {
func Mongoinit(DBname string) {
var baseConfig string
// var baseConfig string
var err error
MongoURL := conf.GetConfig().MongoURL
// if len(os.Getenv("DOCKER_ENVIRONMENT")) == 0 {
// baseConfig = "mongodb"
// } else {
// baseConfig = "mongodb_docker"
// }
if len(os.Getenv("DOCKER_ENVIRONMENT")) == 0 {
baseConfig = "mongodb"
} else {
baseConfig = "mongodb_docker"
}
mongoURI, err := beego.AppConfig.String(baseConfig + "::url")
if err != nil {
logs.Critical("MongoDB URI error: %v", err)
panic(err)
}
logs.Info("Connecting to %v", mongoURI)
clientOptions := options.Client().ApplyURI(mongoURI)
// mngoClient, err = mongo.NewClient(options.Client().ApplyURI(mongoURI))
// if err = mngoClient.Connect(MngoCtx); err != nil {
// logs.Critical("Mongodb NewClient %v: %v", mongoURI, err)
// MongoURL, err := beego.AppConfig.String(baseConfig + "::url")
// if err != nil {
// logs.Critical("MongoDB URI error: %v", err)
// panic(err)
// }
logs.Info("Connecting to %v", MongoURL)
clientOptions := options.Client().ApplyURI(MongoURL)
mngoClient, _ = mongo.NewClient(options.Client().ApplyURI(MongoURL))
if err = mngoClient.Connect(MngoCtx); err != nil {
logs.Critical("Mongodb NewClient %v: %v", MongoURL, err)
panic(err)
}
MngoCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
// Ping the primary
if mngoClient, err = mongo.Connect(MngoCtx, clientOptions); err != nil {
logs.Critical("Mongodb Connect %v: %v", mongoURI, err)
logs.Critical("Mongodb Connect %v: %v", MongoURL, err)
panic(err)
}
if err = mngoClient.Ping(MngoCtx, nil); err != nil {
logs.Critical("Mongodb Ping %v: %v", mongoURI, err)
logs.Critical("Mongodb Ping %v: %v", MongoURL, err)
panic(err)
}