accessor
This commit is contained in:
@@ -7,7 +7,6 @@ import (
|
||||
"os"
|
||||
"time"
|
||||
|
||||
lib "cloud.o-forge.io/core/oc-lib"
|
||||
"cloud.o-forge.io/core/oc-lib/dbs"
|
||||
"cloud.o-forge.io/core/oc-lib/logs"
|
||||
"github.com/rs/zerolog"
|
||||
@@ -31,11 +30,16 @@ var (
|
||||
|
||||
var MONGOService = MongoDB{}
|
||||
|
||||
type MongoConf interface {
|
||||
GetUrl() string
|
||||
GetDatabase() string
|
||||
}
|
||||
|
||||
type MongoDB struct {
|
||||
Logger zerolog.Logger
|
||||
}
|
||||
|
||||
func (m *MongoDB) Init(collections []string) {
|
||||
func (m *MongoDB) Init(collections []string, config MongoConf) {
|
||||
// var baseConfig string
|
||||
var err error
|
||||
var conf map[string]string
|
||||
@@ -50,15 +54,15 @@ func (m *MongoDB) Init(collections []string) {
|
||||
}
|
||||
json.Unmarshal(db_conf, &conf)
|
||||
|
||||
logger.Info().Msg("Connecting to" + lib.GetConfig().MongoUrl)
|
||||
logger.Info().Msg("Connecting to" + config.GetUrl())
|
||||
|
||||
MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer cancel()
|
||||
|
||||
m.createClient(lib.GetConfig().MongoUrl)
|
||||
m.createClient(config.GetUrl())
|
||||
|
||||
logger.Info().Msg("Connecting mongo client to db " + lib.GetConfig().MongoDatabase)
|
||||
m.prepareDB(collections)
|
||||
logger.Info().Msg("Connecting mongo client to db " + config.GetDatabase())
|
||||
m.prepareDB(collections, config)
|
||||
|
||||
logger.Info().Msg("Database is READY")
|
||||
|
||||
@@ -94,9 +98,9 @@ func (m *MongoDB) createClient(MongoURL string) {
|
||||
|
||||
}
|
||||
|
||||
func (m *MongoDB) prepareDB(list_collection []string) {
|
||||
func (m *MongoDB) prepareDB(list_collection []string, config MongoConf) {
|
||||
var err error
|
||||
mngoDB = mngoClient.Database(lib.GetConfig().MongoDatabase)
|
||||
mngoDB = mngoClient.Database(config.GetDatabase())
|
||||
existingCollections, err = mngoDB.ListCollectionNames(MngoCtx, bson.D{})
|
||||
if err != nil {
|
||||
m.Logger.Fatal().Msg("Error contacting MongoDB\n" + err.Error())
|
||||
|
||||
Reference in New Issue
Block a user