From e8a79e982e4a9eac3c20adba2285e4bf42dbfe42 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Sat, 25 Aug 2012 10:02:33 +0300 Subject: [PATCH] renamed StorageGeter to DataStorage --- cmd/cgr-loader/cgr-loader.go | 2 +- cmd/cgr-rater/cgr-rater.go | 10 +++++----- cmd/cgr-rater/mediator.go | 2 +- cmd/cgr-rater/registration.go | 2 +- cmd/cgr-rater/scheduler.go | 2 +- cmd/stress/cgr-spansstress/cgr-spansstress.go | 2 +- sessionmanager/fssessionmanager.go | 6 +++--- sessionmanager/sessionmanager.go | 2 +- timespans/calldesc.go | 4 ++-- timespans/csvreader.go | 2 +- timespans/storage_interface.go | 2 +- timespans/storage_map.go | 2 +- timespans/storage_mongo.go | 2 +- timespans/storage_postgres.go | 2 +- timespans/storage_redis.go | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index de461f5e8..8e4162dea 100644 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -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) diff --git a/cmd/cgr-rater/cgr-rater.go b/cmd/cgr-rater/cgr-rater.go index 927142050..e0827cf53 100644 --- a/cmd/cgr-rater/cgr-rater.go +++ b/cmd/cgr-rater/cgr-rater.go @@ -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 { diff --git a/cmd/cgr-rater/mediator.go b/cmd/cgr-rater/mediator.go index eb949f129..ec58efb75 100644 --- a/cmd/cgr-rater/mediator.go +++ b/cmd/cgr-rater/mediator.go @@ -31,7 +31,7 @@ import ( type Mediator struct { Connector sessionmanager.Connector - loggerDb timespans.StorageGetter + loggerDb timespans.DataStorage SkipDb bool } diff --git a/cmd/cgr-rater/registration.go b/cmd/cgr-rater/registration.go index 1d1be50f6..f21e994d1 100644 --- a/cmd/cgr-rater/registration.go +++ b/cmd/cgr-rater/registration.go @@ -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) diff --git a/cmd/cgr-rater/scheduler.go b/cmd/cgr-rater/scheduler.go index da62d5a5d..e6a9274dc 100644 --- a/cmd/cgr-rater/scheduler.go +++ b/cmd/cgr-rater/scheduler.go @@ -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)) diff --git a/cmd/stress/cgr-spansstress/cgr-spansstress.go b/cmd/stress/cgr-spansstress/cgr-spansstress.go index d53919215..1bbc6979b 100644 --- a/cmd/stress/cgr-spansstress/cgr-spansstress.go +++ b/cmd/stress/cgr-spansstress/cgr-spansstress.go @@ -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 diff --git a/sessionmanager/fssessionmanager.go b/sessionmanager/fssessionmanager.go index b32abedb9..530a2e15d 100644 --- a/sessionmanager/fssessionmanager.go +++ b/sessionmanager/fssessionmanager.go @@ -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 } diff --git a/sessionmanager/sessionmanager.go b/sessionmanager/sessionmanager.go index d22c35ab1..81c41250c 100644 --- a/sessionmanager/sessionmanager.go +++ b/sessionmanager/sessionmanager.go @@ -25,5 +25,5 @@ import ( type SessionManager interface { DisconnectSession(*Session) GetSessionDelegate() *SessionDelegate - GetDbLogger() timespans.StorageGetter + GetDbLogger() timespans.DataStorage } diff --git a/timespans/calldesc.go b/timespans/calldesc.go index 8d31c19be..9ae8095ea 100644 --- a/timespans/calldesc.go +++ b/timespans/calldesc.go @@ -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 } diff --git a/timespans/csvreader.go b/timespans/csvreader.go index c78eba732..c58c1977e 100644 --- a/timespans/csvreader.go +++ b/timespans/csvreader.go @@ -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() } diff --git a/timespans/storage_interface.go b/timespans/storage_interface.go index 282459272..c6c04a216 100644 --- a/timespans/storage_interface.go +++ b/timespans/storage_interface.go @@ -38,7 +38,7 @@ const ( /* Interface for storage providers. */ -type StorageGetter interface { +type DataStorage interface { Close() Flush() error GetRatingProfile(string) (*RatingProfile, error) diff --git a/timespans/storage_map.go b/timespans/storage_map.go index 23aad69a7..b8d86197a 100644 --- a/timespans/storage_map.go +++ b/timespans/storage_map.go @@ -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 } diff --git a/timespans/storage_mongo.go b/timespans/storage_mongo.go index 294c0851f..f767c8cf7 100644 --- a/timespans/storage_mongo.go +++ b/timespans/storage_mongo.go @@ -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) diff --git a/timespans/storage_postgres.go b/timespans/storage_postgres.go index 77789e494..85bb30411 100644 --- a/timespans/storage_postgres.go +++ b/timespans/storage_postgres.go @@ -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 diff --git a/timespans/storage_redis.go b/timespans/storage_redis.go index 157940fe2..65c8e2577 100644 --- a/timespans/storage_redis.go +++ b/timespans/storage_redis.go @@ -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 }