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

renamed StorageGeter to DataStorage

Browse Source
This commit is contained in:
Radu Ioan Fericean
2012-08-25 10:02:33 +03:00
parent 2a1337f65b
commit e8a79e982e
15 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
var getter timespans.StorageGetter
var getter timespans.DataStorage
switch *db_type {
case REDIS:
db_nb, err := strconv.Atoi(*db_name)

10
cmd/cgr-rater/cgr-rater.go
View File

@@ -191,7 +191,7 @@ func listenToHttpRequests() {
http.ListenAndServe(stats_listen, nil)
}
func startMediator(responder *timespans.Responder, loggerDb timespans.StorageGetter) {
func startMediator(responder *timespans.Responder, loggerDb timespans.DataStorage) {
var connector sessionmanager.Connector
if mediator_rater == INTERNAL {
connector = responder
@@ -213,7 +213,7 @@ func startMediator(responder *timespans.Responder, loggerDb timespans.StorageGet
m.parseCSV()
}
func startSessionManager(responder *timespans.Responder, loggerDb timespans.StorageGetter) {
func startSessionManager(responder *timespans.Responder, loggerDb timespans.DataStorage) {
var connector sessionmanager.Connector
if sm_rater == INTERNAL {
connector = responder
@@ -286,7 +286,7 @@ func checkConfigSanity() {
}
}
func configureDatabase(db_type, host, port, name, user, pass string) (getter timespans.StorageGetter, err error) {
func configureDatabase(db_type, host, port, name, user, pass string) (getter timespans.DataStorage, err error) {
switch db_type {
case REDIS:
@@ -328,13 +328,13 @@ func main() {
// some consitency checks
go checkConfigSanity()
var getter, loggerDb timespans.StorageGetter
var getter, loggerDb timespans.DataStorage
go func() {
getter, err = configureDatabase(data_db_type, data_db_host, data_db_port, data_db_name, data_db_user, data_db_pass)
if err == nil {
defer getter.Close()
timespans.SetStorageGetter(getter)
timespans.SetDataStorage(getter)
}
if log_db_type == SAME {

2
cmd/cgr-rater/mediator.go
View File

@@ -31,7 +31,7 @@ import (
type Mediator struct {
Connector sessionmanager.Connector
loggerDb timespans.StorageGetter
loggerDb timespans.DataStorage
SkipDb bool
}

2
cmd/cgr-rater/registration.go
View File

@@ -95,7 +95,7 @@ func registerToBalancer() {
}
// Listens for the HUP system signal and gracefuly reloads the timers from database.
func reloadSchedulerSingnalHandler(getter timespans.StorageGetter) {
func reloadSchedulerSingnalHandler(getter timespans.DataStorage) {
timespans.Logger.Info("Handling HUP signal...")
for {
c := make(chan os.Signal)

2
cmd/cgr-rater/scheduler.go
View File

@@ -64,7 +64,7 @@ func (s scheduler) loop() {
}
}
func loadActionTimings(storage timespans.StorageGetter) {
func loadActionTimings(storage timespans.DataStorage) {
actionTimings, err := storage.GetAllActionTimings()
if err != nil {
timespans.Logger.Warning(fmt.Sprintf("Cannot get action timings: %v", err))

2
cmd/stress/cgr-spansstress/cgr-spansstress.go
View File

@@ -63,7 +63,7 @@ func main() {
//getter, err := timespans.NewMongoStorage("localhost", "cgrates")
defer getter.Close()
timespans.SetStorageGetter(getter)
timespans.SetDataStorage(getter)
log.Printf("Runnning %d cycles...", *runs)
var result *timespans.CallCost

6
sessionmanager/fssessionmanager.go
View File

@@ -34,12 +34,12 @@ type FSSessionManager struct {
buf *bufio.Reader
sessions []*Session
sessionDelegate *SessionDelegate
loggerDB timespans.StorageGetter
loggerDB timespans.DataStorage
address, pass string
delayFunc func() int
}
func NewFSSessionManager(storage timespans.StorageGetter) *FSSessionManager {
func NewFSSessionManager(storage timespans.DataStorage) *FSSessionManager {
return &FSSessionManager{loggerDB: storage}
}
@@ -176,7 +176,7 @@ func (sm *FSSessionManager) GetSessionDelegate() *SessionDelegate {
return sm.sessionDelegate
}
func (sm *FSSessionManager) GetDbLogger() timespans.StorageGetter {
func (sm *FSSessionManager) GetDbLogger() timespans.DataStorage {
return sm.loggerDB
}

2
sessionmanager/sessionmanager.go
View File

@@ -25,5 +25,5 @@ import (
type SessionManager interface {
DisconnectSession(*Session)
GetSessionDelegate() *SessionDelegate
GetDbLogger() timespans.StorageGetter
GetDbLogger() timespans.DataStorage
}

4
timespans/calldesc.go
View File

@@ -107,14 +107,14 @@ func (cd *CallDescriptor) getUserBalance() (ub *UserBalance, err error) {
/*
Exported method to set the storage getter.
*/
func SetStorageGetter(sg StorageGetter) {
func SetDataStorage(sg DataStorage) {
storageGetter = sg
}
/*
Sets the database for logging (can be de same as storage getter or different db)
*/
func SetStorageLogger(sg StorageGetter) {
func SetStorageLogger(sg DataStorage) {
storageLogger = sg
}

2
timespans/csvreader.go
View File

@@ -79,7 +79,7 @@ func openStringCSVReader(data string, comma rune) (csvReader *csv.Reader, fp *os
return
}
func (csvr *CSVReader) WriteToDatabase(storage StorageGetter, flush, verbose bool) (err error) {
func (csvr *CSVReader) WriteToDatabase(storage DataStorage, flush, verbose bool) (err error) {
if flush {
storage.Flush()
}

2
timespans/storage_interface.go
View File

@@ -38,7 +38,7 @@ const (
/*
Interface for storage providers.
*/
type StorageGetter interface {
type DataStorage interface {
Close()
Flush() error
GetRatingProfile(string) (*RatingProfile, error)

2
timespans/storage_map.go
View File

@@ -30,7 +30,7 @@ type MapStorage struct {
ms Marshaler
}
func NewMapStorage() (StorageGetter, error) {
func NewMapStorage() (DataStorage, error) {
return &MapStorage{dict: make(map[string][]byte), ms: new(MyMarshaler)}, nil
}

2
timespans/storage_mongo.go
View File

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

2
timespans/storage_postgres.go
View File

@@ -29,7 +29,7 @@ type PostgresStorage struct {
Db *sql.DB
}
func NewPostgresStorage(host, port, name, user, password string) (StorageGetter, error) {
func NewPostgresStorage(host, port, name, user, password string) (DataStorage, error) {
db, err := sql.Open("postgres", fmt.Sprintf("host=%s port=%s dbname=%s user=%s password=%s sslmode=disable", host, port, name, user, password))
if err != nil {
return nil, err

2
timespans/storage_redis.go
View File

@@ -30,7 +30,7 @@ type RedisStorage struct {
ms Marshaler
}
func NewRedisStorage(address string, db int, pass string) (StorageGetter, error) {
func NewRedisStorage(address string, db int, pass string) (DataStorage, error) {
if address != "" {
address = "tcp:" + address
}