From 6eb4be05c27f02a7face5b67c7e707d45ce43472 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 1 Sep 2020 13:39:38 +0300 Subject: [PATCH] Updated mongoDB driver constructor --- dispatchers/replicator_it_test.go | 7 +++++++ engine/storage_mongo_datadb.go | 6 ++---- engine/storage_utils.go | 4 ++-- engine/z_actions2_it_test.go | 2 +- engine/z_datamanager_it_test.go | 2 +- engine/z_filterindexer_it_test.go | 2 +- engine/z_onstor_it_test.go | 2 +- engine/z_stordb_it_test.go | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dispatchers/replicator_it_test.go b/dispatchers/replicator_it_test.go index e2ec10b24..033ad6ed6 100644 --- a/dispatchers/replicator_it_test.go +++ b/dispatchers/replicator_it_test.go @@ -1078,6 +1078,7 @@ func testDspRplActions(t *testing.T) { ActionType: utils.LOG, }, }, + Key: "KeyActions", Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", @@ -1143,6 +1144,7 @@ func testDspRplActionPlan(t *testing.T) { }, }, }, + Key: "KeyActionPlan", Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", @@ -1197,6 +1199,7 @@ func testDspRplAccountActionPlans(t *testing.T) { setAccountActionPlans := &engine.SetAccountActionPlansArgWithOpts{ AplIDs: []string{"KeyAccountActionPlans"}, Overwrite: true, + AcntID: "KeyAccountActionPlans", Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", @@ -1269,6 +1272,7 @@ func testDspRplRatingPlan(t *testing.T) { // Get RatingPlan var reply engine.RatingPlan argsRatingPlan := &utils.StringWithOpts{ + Arg: "id", Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", @@ -1325,6 +1329,7 @@ func testDspRplRatingProfile(t *testing.T) { // Get RatingProfile var reply engine.RatingProfile argsRatingProfile := &utils.StringWithOpts{ + Arg: "idRatingProfile", Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", @@ -1379,6 +1384,7 @@ func testDspRplDestination(t *testing.T) { // Get Destination var reply engine.Destination argsDestination := &utils.StringWithOpts{ + Arg: "idDestination", Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", @@ -1433,6 +1439,7 @@ func testDspRplLoadIDs(t *testing.T) { // Get LoadIDs var reply map[string]int64 argsLoadIDs := &utils.StringWithOpts{ + Arg: "idLoadIDs", Tenant: "cgrates.org", Opts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index c7e9a003a..9e47ea774 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -126,7 +126,7 @@ func TimeDecodeValue1(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val ref // NewMongoStorage givese new mongo driver func NewMongoStorage(host, port, db, user, pass, mrshlerStr, storageType string, - cdrsIndexes []string, isDataDB bool, ttl time.Duration) (ms *MongoStorage, err error) { + cdrsIndexes []string, ttl time.Duration) (ms *MongoStorage, err error) { url := host if port != "" { url += ":" + port @@ -171,7 +171,6 @@ func NewMongoStorage(host, port, db, user, pass, mrshlerStr, storageType string, storageType: storageType, ms: mrshler, cdrsIndexes: cdrsIndexes, - isDataDB: isDataDB, } if err = ms.query(func(sctx mongo.SessionContext) error { @@ -208,7 +207,6 @@ type MongoStorage struct { ms Marshaler cdrsIndexes []string cnter *utils.Counter - isDataDB bool } func (ms *MongoStorage) query(argfunc func(ctx mongo.SessionContext) error) (err error) { @@ -221,7 +219,7 @@ func (ms *MongoStorage) query(argfunc func(ctx mongo.SessionContext) error) (err // IsDataDB returns if the storeage is used for DataDb func (ms *MongoStorage) IsDataDB() bool { - return ms.isDataDB + return ms.storageType == utils.DataDB } // SetTTL set the context TTL used for queries (is thread safe) diff --git a/engine/storage_utils.go b/engine/storage_utils.go index 3e929a80f..aa8acb660 100644 --- a/engine/storage_utils.go +++ b/engine/storage_utils.go @@ -62,7 +62,7 @@ func NewDataDBConn(dbType, host, port, name, user, if ttl, err = utils.IfaceAsDuration(opts[utils.QueryTimeoutCfg]); err != nil { return } - d, err = NewMongoStorage(host, port, name, user, pass, marshaler, utils.DataDB, nil, true, ttl) + d, err = NewMongoStorage(host, port, name, user, pass, marshaler, utils.DataDB, nil, ttl) case utils.INTERNAL: d = NewInternalDB(nil, nil, true) default: @@ -81,7 +81,7 @@ func NewStorDBConn(dbType, host, port, name, user, pass, marshaler string, if ttl, err = utils.IfaceAsDuration(opts[utils.QueryTimeoutCfg]); err != nil { return nil, err } - db, err = NewMongoStorage(host, port, name, user, pass, marshaler, utils.StorDB, stringIndexedFields, false, ttl) + db, err = NewMongoStorage(host, port, name, user, pass, marshaler, utils.StorDB, stringIndexedFields, ttl) case utils.POSTGRES: var maxConn, maxIdleConn, connMaxLifetime int64 if maxConn, err = utils.IfaceAsTInt64(opts[utils.MaxOpenConnsCfg]); err != nil { diff --git a/engine/z_actions2_it_test.go b/engine/z_actions2_it_test.go index 95bca2bde..2548064c8 100644 --- a/engine/z_actions2_it_test.go +++ b/engine/z_actions2_it_test.go @@ -98,7 +98,7 @@ func testActionsInitCdrsStore(t *testing.T) { actsCfg.StorDbCfg().Port, actsCfg.StorDbCfg().Name, actsCfg.StorDbCfg().User, actsCfg.StorDbCfg().Password, actsCfg.GeneralCfg().DBDataEncoding, - utils.StorDB, nil, false, 10*time.Second); err != nil { + utils.StorDB, nil, 10*time.Second); err != nil { t.Fatal("Could not connect to mongo", err.Error()) } case utils.MetaPostgres: diff --git a/engine/z_datamanager_it_test.go b/engine/z_datamanager_it_test.go index 560917099..1f859b7e9 100644 --- a/engine/z_datamanager_it_test.go +++ b/engine/z_datamanager_it_test.go @@ -67,7 +67,7 @@ func TestDMitinitDB(t *testing.T) { mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, mgoITCfg.GeneralCfg().DBDataEncoding, - utils.StorDB, nil, false, 10*time.Second) + utils.StorDB, nil, 10*time.Second) if err != nil { t.Fatal("Could not connect to Mongo", err.Error()) } diff --git a/engine/z_filterindexer_it_test.go b/engine/z_filterindexer_it_test.go index b2581610f..3f01922fa 100644 --- a/engine/z_filterindexer_it_test.go +++ b/engine/z_filterindexer_it_test.go @@ -96,7 +96,7 @@ func TestFilterIndexerIT(t *testing.T) { mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, mgoITCfg.GeneralCfg().DBDataEncoding, - utils.StorDB, nil, false, 10*time.Second) + utils.StorDB, nil, 10*time.Second) if err != nil { t.Fatal(err) } diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index abf4b649e..5c50c4a5a 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -111,7 +111,7 @@ func TestOnStorIT(t *testing.T) { mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, mgoITCfg.GeneralCfg().DBDataEncoding, - utils.StorDB, nil, false, 10*time.Second); err != nil { + utils.StorDB, nil, 10*time.Second); err != nil { t.Fatal(err) } onStorCfg = mgoITCfg.StorDbCfg().Name diff --git a/engine/z_stordb_it_test.go b/engine/z_stordb_it_test.go index 137b1838c..0e1f2caae 100644 --- a/engine/z_stordb_it_test.go +++ b/engine/z_stordb_it_test.go @@ -87,7 +87,7 @@ func TestStorDBit(t *testing.T) { cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, cfg.StorDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, - utils.StorDB, cfg.StorDbCfg().StringIndexedFields, false, 10*time.Second); err != nil { + utils.StorDB, cfg.StorDbCfg().StringIndexedFields, 10*time.Second); err != nil { t.Fatal(err) } case utils.MetaPostgres: