From 28bca0efccd79208bd02bcee19a6be4848b3d87a Mon Sep 17 00:00:00 2001
From: Radu Ioan Fericean <radu@fericean.ro>
Date: Fri, 17 May 2013 14:46:33 +0300
Subject: [PATCH] fixed mongo storage

---
 cmd/cgr-loader/cgr-loader.go                  |  4 ++--
 cmd/cgr-rater/cgr-rater.go                    | 10 +++++-----
 cmd/stress/cgr-spansstress/cgr-spansstress.go |  2 +-
 rater/calldesc.go                             |  4 ++--
 rater/storage_mongo.go                        |  2 +-
 update_external_libs.sh                       |  2 ++
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go
index 5d8c09658..a96d3f6c0 100644
--- a/cmd/cgr-loader/cgr-loader.go
+++ b/cmd/cgr-loader/cgr-loader.go
@@ -148,14 +148,14 @@ func main() {
 	var getter rater.DataStorage
 	switch *db_type {
 	case REDIS:
-		db_nb, err := strconv.Atoi(*db_name)		
+		db_nb, err := strconv.Atoi(*db_name)
 		if err != nil {
 			log.Fatal("Redis db name must be an integer!")
 		}
 		if *db_port != "" {
 			*db_host += ":" + *db_port
 		}
-		getter, err = rater.NewRedisStorage(*db_host, db_nb, *db_pass)
+		getter, err = rater.NewGosexyStorage(*db_host, db_nb, *db_pass)
 	case MONGO:
 		getter, err = rater.NewMongoStorage(*db_host, *db_port, *db_name, *db_user, *db_pass)
 	case POSTGRES:
diff --git a/cmd/cgr-rater/cgr-rater.go b/cmd/cgr-rater/cgr-rater.go
index dbb78fc55..f23f8c075 100644
--- a/cmd/cgr-rater/cgr-rater.go
+++ b/cmd/cgr-rater/cgr-rater.go
@@ -170,7 +170,7 @@ func startSessionManager(responder *rater.Responder, loggerDb rater.DataStorage)
 				}
 				time.Sleep(time.Duration(i/2) * time.Second)
 			}
-			
+
 		}
 		if err != nil {
 			rater.Logger.Crit(fmt.Sprintf("Could not connect to rater: %v", err))
@@ -225,7 +225,7 @@ func checkConfigSanity() error {
 		if cfg.BalancerEnabled {
 			if cfg.BalancerRPCEncoding != cfg.MediatorRPCEncoding {
 				rater.Logger.Crit("If you are connecting the mediator via the loopback to the balancer use the same type of rpc encoding!")
-				return  errors.New("Balancer and Mediator using different encoding")
+				return errors.New("Balancer and Mediator using different encoding")
 			}
 		}
 		if cfg.RaterEnabled {
@@ -250,7 +250,7 @@ func configureDatabase(db_type, host, port, name, user, pass string) (getter rat
 		if port != "" {
 			host += ":" + port
 		}
-		getter, err = rater.NewRedisStorage(host, db_nb, pass)
+		getter, err = rater.NewGosexyStorage(host, db_nb, pass)
 	case MONGO:
 		getter, err = rater.NewMongoStorage(host, port, name, user, pass)
 	case POSTGRES:
@@ -261,7 +261,7 @@ func configureDatabase(db_type, host, port, name, user, pass string) (getter rat
 	}
 
 	if err != nil {
-		return nil, err 
+		return nil, err
 	}
 	return getter, nil
 }
@@ -282,7 +282,7 @@ func main() {
 	// some consitency checks
 	errCfg := checkConfigSanity()
 	if errCfg != nil {
-		rater.Logger.Crit( errCfg.Error() )
+		rater.Logger.Crit(errCfg.Error())
 		return
 	}
 
diff --git a/cmd/stress/cgr-spansstress/cgr-spansstress.go b/cmd/stress/cgr-spansstress/cgr-spansstress.go
index 89feef2b9..38617d5ec 100644
--- a/cmd/stress/cgr-spansstress/cgr-spansstress.go
+++ b/cmd/stress/cgr-spansstress/cgr-spansstress.go
@@ -59,7 +59,7 @@ func main() {
 	t2 := time.Date(2012, time.February, 02, 18, 30, 0, 0, time.UTC)
 	cd := rater.CallDescriptor{Direction: "OUT", TOR: "0", Tenant: "vdf", Subject: "rif", Destination: "0256", TimeStart: t1, TimeEnd: t2}
 
-	getter, err := rater.NewRedisStorage("localhost:6379", 10, "")
+	getter, err := rater.NewGosexyStorage("localhost:6379", 10, "")
 	//getter, err := rater.NewMongoStorage("localhost", "cgrates")
 	defer getter.Close()
 
diff --git a/rater/calldesc.go b/rater/calldesc.go
index 155d87dbe..4f2e074a8 100644
--- a/rater/calldesc.go
+++ b/rater/calldesc.go
@@ -50,8 +50,8 @@ var (
 	//storageGetter, _ = NewRedisStorage(db_server+":6379", 11, "")
 	//storageGetter, _ = NewRedigoStorage(db_server+":6379", 11, "")
 	//storageGetter, _ = NewGosexyStorage(db_server+":6379", 11, "")
-	storageLogger    = storageGetter
-	debitPeriod      = 10 * time.Second
+	storageLogger = storageGetter
+	debitPeriod   = 10 * time.Second
 )
 
 /*
diff --git a/rater/storage_mongo.go b/rater/storage_mongo.go
index 6a9b57bc7..80d419ec7 100644
--- a/rater/storage_mongo.go
+++ b/rater/storage_mongo.go
@@ -124,7 +124,7 @@ type LogErrEntry struct {
 
 func (ms *MongoStorage) GetRatingProfile(key string) (rp *RatingProfile, err error) {
 	rp = new(RatingProfile)
-	err = ms.db.C("ratingprofiles").Find(bson.M{"_id": key}).One(&rp)
+	err = ms.db.C("ratingprofiles").Find(bson.M{"id": key}).One(&rp)
 	return
 }
 
diff --git a/update_external_libs.sh b/update_external_libs.sh
index 802e13a9f..7bd0e6ee7 100755
--- a/update_external_libs.sh
+++ b/update_external_libs.sh
@@ -1,7 +1,9 @@
+#!/usr/bin/env sh
 go get -v -u github.com/fzzy/radix/redis
 go get -v -u code.google.com/p/goconf/conf
 go get -v -u github.com/bmizerany/pq
 go get -v -u github.com/vmihailenco/msgpack
+go get -v -u github.com/ugorji/go-msgpack
 go get -v -u labix.org/v2/mgo
 go get -v -u github.com/cgrates/fsock
 go get -u -v github.com/go-sql-driver/mysql