From 6ae76238d5c3857c3f49613226c2670b5b9a1264 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Sun, 30 Nov 2014 20:34:09 +0100
Subject: [PATCH] Fixups postgres as stordb for offline TP data

---
 data/scripts/pkg/debian/cgrates.default |  2 +-
 engine/storage_utils.go                 | 26 ++++++++-----------------
 test.sh                                 |  5 +----
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/data/scripts/pkg/debian/cgrates.default b/data/scripts/pkg/debian/cgrates.default
index dc9578cec..2e880651d 100644
--- a/data/scripts/pkg/debian/cgrates.default
+++ b/data/scripts/pkg/debian/cgrates.default
@@ -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.
diff --git a/engine/storage_utils.go b/engine/storage_utils.go
index a4323184d..f22b50434 100644
--- a/engine/storage_utils.go
+++ b/engine/storage_utils.go
@@ -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
 }
diff --git a/test.sh b/test.sh
index fe3c8ace5..508555ecc 100755
--- a/test.sh
+++ b/test.sh
@@ -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