uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 10:06:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixups postgres as stordb for offline TP data

Browse Source
This commit is contained in:
DanB
2014-11-30 20:34:09 +01:00
parent 54669c93a0
commit 6ae76238d5
3 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/pkg/debian/cgrates.default
View File

@@ -10,7 +10,7 @@ ENABLE=false
# what extra options to give cgrates binary?
# See cgr-engine -h for options
#ENGINE_OPTS=''
#DAEMON_OPTS=''
# Don't forget to create an appropriate config file,
# else the CGRateS system will not start.

26
engine/storage_utils.go
View File

@@ -41,7 +41,6 @@ func ConfigureRatingStorage(db_type, host, port, name, user, pass, marshaler str
host += ":" + port
}
d, err = NewRedisStorage(host, db_nb, pass, marshaler)
db = d.(RatingStorage)
/*
// Add here as soon as interface implemented
case utils.MONGO:
@@ -54,7 +53,7 @@ func ConfigureRatingStorage(db_type, host, port, name, user, pass, marshaler str
if err != nil {
return nil, err
}
return db, nil
return d.(RatingStorage), nil
}
func ConfigureAccountingStorage(db_type, host, port, name, user, pass, marshaler string) (db AccountingStorage, err error) {
@@ -71,7 +70,6 @@ func ConfigureAccountingStorage(db_type, host, port, name, user, pass, marshaler
host += ":" + port
}
d, err = NewRedisStorage(host, db_nb, pass, marshaler)
db = d.(AccountingStorage)
/*
case utils.MONGO:
d, err = NewMongoStorage(host, port, name, user, pass)
@@ -83,7 +81,7 @@ func ConfigureAccountingStorage(db_type, host, port, name, user, pass, marshaler
if err != nil {
return nil, err
}
return db, nil
return d.(AccountingStorage), nil
}
func ConfigureLogStorage(db_type, host, port, name, user, pass, marshaler string, maxConn, maxIdleConn int) (db LogStorage, err error) {
@@ -120,39 +118,31 @@ func ConfigureLogStorage(db_type, host, port, name, user, pass, marshaler string
func ConfigureLoadStorage(db_type, host, port, name, user, pass, marshaler string, maxConn, maxIdleConn int) (db LoadStorage, err error) {
var d Storage
switch db_type {
/*
case utils.POSTGRES:
d, err = NewPostgresStorage(host, port, name, user, pass)
db = d.(LoadStorage)
*/
case utils.POSTGRES:
d, err = NewPostgresStorage(host, port, name, user, pass, maxConn, maxIdleConn)
case utils.MYSQL:
d, err = NewMySQLStorage(host, port, name, user, pass, maxConn, maxIdleConn)
db = d.(LoadStorage)
default:
err = errors.New("unknown db")
}
if err != nil {
return nil, err
}
return db, nil
return d.(LoadStorage), nil
}
func ConfigureCdrStorage(db_type, host, port, name, user, pass string, maxConn, maxIdleConn int) (db CdrStorage, err error) {
var d Storage
switch db_type {
/*
case utils.POSTGRES:
d, err = NewPostgresStorage(host, port, name, user, pass)
db = d.(CdrStorage)
*/
case utils.POSTGRES:
d, err = NewPostgresStorage(host, port, name, user, pass, maxConn, maxIdleConn)
case utils.MYSQL:
d, err = NewMySQLStorage(host, port, name, user, pass, maxConn, maxIdleConn)
db = d.(CdrStorage)
default:
err = errors.New("unknown db")
}
if err != nil {
return nil, err
}
return db, nil
return d.(CdrStorage), nil
}

5
test.sh
View File

@@ -4,7 +4,6 @@ go test -i github.com/cgrates/cgrates/engine
go test -i github.com/cgrates/cgrates/sessionmanager
go test -i github.com/cgrates/cgrates/config
go test -i github.com/cgrates/cgrates/cmd/cgr-engine
go test -i github.com/cgrates/fsock
go test -i github.com/cgrates/cgrates/cache2go
go test -i github.com/cgrates/cgrates/cdrc
go test -i github.com/cgrates/cgrates/utils
@@ -25,8 +24,6 @@ go test github.com/cgrates/cgrates/cdrc
cdrcs=$?
go test github.com/cgrates/cgrates/utils
ut=$?
go test github.com/cgrates/fsock
fs=$?
go test github.com/cgrates/cgrates/history
hs=$?
go test github.com/cgrates/cgrates/cache2go
@@ -34,5 +31,5 @@ c2g=$?
go test github.com/cgrates/cgrates/cdre
cdre=$?
exit $en && $gt && $sm && $cfg && $bl && $cr && $cdrc && $fs && $ut && $hs && $c2g && $cdre
exit $en && $gt && $sm && $cfg && $bl && $cr && $cdrc && $ut && $hs && $c2g && $cdre