renamed StorageGeter to DataStorage

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

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)

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 {

View File

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

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)

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))

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