uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-14 20:59:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

added mongo back as an option in the conf

Browse Source
This commit is contained in:
Radu Ioan Fericean
2015-10-12 15:57:29 +03:00
parent 28561dba1f
commit 407ccf42c9
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cgr-engine/cgr-engine.go
View File

@@ -558,7 +558,7 @@ func main() {
logDb, err = engine.ConfigureLogStorage(cfg.StorDBType, cfg.StorDBHost, cfg.StorDBPort,
cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, cfg.DBDataEncoding, cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns)
if err != nil { // Cannot configure logger database, show stopper
utils.Logger.Crit(fmt.Sprintf("Could not configure logger database: %s exiting!", err))
utils.Logger.Crit(fmt.Sprintf("Could not configure logger database: %s exiting! (%+v)", err, cfg))
return
}
defer logDb.Close()

7
data/conf/samples/cgradmin/cgradmin.json
View File

@@ -10,6 +10,13 @@
"http": ":2080", // HTTP listening address
},
"stor_db": { // database used to store offline tariff plans and CDRs
"db_type": "mongo", // stor database type to use: <mysql|postgres>
"db_host": "127.0.0.1", // the host to connect to
"db_port": 27017, // the port to reach the stordb
"db_name": "cgrates",
},
"rater": {
"enabled": true, // enable Rater service: <true|false>
"pubsubs": "internal",

4
engine/calldesc.go
View File

@@ -46,11 +46,11 @@ func init() {
accountingStorage, _ = NewMapStorage()
} else {
var err error
ratingStorage, err = NewMongoStorage("127.0.0.1:27017", "cgrates_rating_test", "", "")
ratingStorage, err = NewMongoStorage("127.0.0.1", "27017", "cgrates_rating_test", "", "")
if err != nil {
log.Fatal(err)
}
accountingStorage, err = NewMongoStorage("127.0.0.1:27017", "cgrates_accounting_test", "", "")
accountingStorage, err = NewMongoStorage("127.0.0.1", "27017", "cgrates_accounting_test", "", "")
if err != nil {
log.Fatal(err)
}

3
engine/storage_mongo.go
View File

@@ -60,7 +60,8 @@ type MongoStorage struct {
db *mgo.Database
}
func NewMongoStorage(address, db, user, pass string) (*MongoStorage, error) {
func NewMongoStorage(host, port, db, user, pass string) (*MongoStorage, error) {
address := fmt.Sprintf("%s:%s", host, port)
if user != "" && pass != "" {
address = fmt.Sprintf("%s:%s@%s", user, pass, address)
}

16
engine/storage_utils.go
View File

@@ -64,11 +64,9 @@ func ConfigureAccountingStorage(db_type, host, port, name, user, pass, marshaler
host += ":" + port
}
d, err = NewRedisStorage(host, db_nb, pass, marshaler)
/*
case utils.MONGO:
d, err = NewMongoStorage(host, port, name, user, pass)
db = d.(AccountingStorage)
*/
case utils.MONGO:
d, err = NewMongoStorage(host, port, name, user, pass)
db = d.(AccountingStorage)
default:
err = errors.New("unknown db")
}
@@ -93,9 +91,9 @@ func ConfigureLogStorage(db_type, host, port, name, user, pass, marshaler string
host += ":" + port
}
d, err = NewRedisStorage(host, db_nb, pass, marshaler)
case utils.MONGO:
d, err = NewMongoStorage(host, port, name, user, pass)
*/
case utils.MONGO:
d, err = NewMongoStorage(host, port, name, user, pass)
case utils.POSTGRES:
d, err = NewPostgresStorage(host, port, name, user, pass, maxConn, maxIdleConn)
case utils.MYSQL:
@@ -116,6 +114,8 @@ func ConfigureLoadStorage(db_type, host, port, name, user, pass, marshaler strin
d, err = NewPostgresStorage(host, port, name, user, pass, maxConn, maxIdleConn)
case utils.MYSQL:
d, err = NewMySQLStorage(host, port, name, user, pass, maxConn, maxIdleConn)
case utils.MONGO:
d, err = NewMongoStorage(host, port, name, user, pass)
default:
err = errors.New("unknown db")
}
@@ -132,6 +132,8 @@ func ConfigureCdrStorage(db_type, host, port, name, user, pass string, maxConn,
d, err = NewPostgresStorage(host, port, name, user, pass, maxConn, maxIdleConn)
case utils.MYSQL:
d, err = NewMySQLStorage(host, port, name, user, pass, maxConn, maxIdleConn)
case utils.MONGO:
d, err = NewMongoStorage(host, port, name, user, pass)
default:
err = errors.New("unknown db")
}