fix for storage interface nil

This commit is contained in:
Radu Ioan Fericean
2014-01-14 19:10:15 +02:00
parent 2c1b96c6b3
commit 4738f7d882
2 changed files with 6 additions and 8 deletions

View File

@@ -21,6 +21,7 @@ package engine
import (
"database/sql"
"fmt"
_ "github.com/go-sql-driver/mysql"
)
@@ -33,8 +34,8 @@ func NewMySQLStorage(host, port, name, user, password string) (Storage, error) {
if err != nil {
return nil, err
}
if err := db.Ping(); err != nil {
/*if err := db.Ping(); err != nil {
return nil, err
}
}*/
return &MySQLStorage{&SQLStorage{db}}, nil
}

View File

@@ -20,8 +20,9 @@ package engine
import (
"errors"
"github.com/cgrates/cgrates/utils"
"strconv"
"github.com/cgrates/cgrates/utils"
)
// Various helpers to deal with database
@@ -100,24 +101,20 @@ func ConfigureLogStorage(db_type, host, port, name, user, pass, marshaler string
host += ":" + port
}
d, err = NewRedisStorage(host, db_nb, pass, marshaler)
db = d.(LogStorage)
case utils.MONGO:
d, err = NewMongoStorage(host, port, name, user, pass)
db = d.(LogStorage)
case utils.POSTGRES:
d, err = NewPostgresStorage(host, port, name, user, pass)
db = d.(LogStorage)
*/
case utils.MYSQL:
d, err = NewMySQLStorage(host, port, name, user, pass)
db = d.(LogStorage)
default:
err = errors.New("unknown db")
}
if err != nil {
return nil, err
}
return db, nil
return db.(LogStorage), nil
}
func ConfigureLoadStorage(db_type, host, port, name, user, pass, marshaler string) (db LoadStorage, err error) {