added one more driver for redis

rater/calldesc.go

@@ -42,15 +42,16 @@ const (
 )
 
 var (
-	Logger    LoggerInterface
-	db_server = "127.0.0.1"
-	//db_server = "192.168.0.17"
-	storageGetter, _ = NewMapStorage()
+	Logger LoggerInterface
+	//db_server = "127.0.0.1"
+	db_server = "192.168.0.17"
+	//storageGetter, _ = NewMapStorage()
 	//storageGetter, _ = NewMongoStorage(db_server, "27017", "cgrates_test", "", "")
 	//storageGetter, _ = NewRedisStorage(db_server+":6379", 11, "")
 	//storageGetter, _ = NewRedigoStorage(db_server+":6379", 11, "")
-	storageLogger = storageGetter
-	debitPeriod   = 10 * time.Second
+	storageGetter, _ = NewGosexyStorage(db_server+":6379", 11, "")
+	storageLogger    = storageGetter
+	debitPeriod      = 10 * time.Second
 )
 
 /*

rater/storage_gosexy.go

@@ -0,0 +1,219 @@
+/*
+Rating system designed to be used in VoIP Carriers World
+Copyright (C) 2013 ITsysCOM
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+package rater
+
+import (
+	"fmt"
+	"menteslibres.net/gosexy/redis"
+	//"log"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type GosexyStorage struct {
+	dbNb int
+	db   *redis.Client
+	ms   Marshaler
+}
+
+func NewGosexyStorage(address string, db int, pass string) (DataStorage, error) {
+	addrSplit := strings.Split(address, ":")
+	host := addrSplit[0]
+	port := 6379
+	if len(addrSplit) == 2 {
+		port, _ = strconv.Atoi(addrSplit[1])
+	}
+	ndb := redis.New()
+	err := ndb.Connect(host, uint(port))
+	if err != nil {
+		return nil, err
+	}
+	if pass != "" {
+		if _, err = ndb.Auth(pass); err != nil {
+			return nil, err
+		}
+	}
+	if db > 0 {
+		if _, err = ndb.Select(int64(db)); err != nil {
+			return nil, err
+		}
+	}
+	ms := new(MyMarshaler)
+	return &GosexyStorage{db: ndb, dbNb: db, ms: ms}, nil
+}
+
+func (rs *GosexyStorage) Close() {
+	rs.db.Quit()
+}
+
+func (rs *GosexyStorage) Flush() (err error) {
+	_, err = rs.db.FlushDB()
+	return
+}
+
+func (rs *GosexyStorage) GetRatingProfile(key string) (rp *RatingProfile, err error) {
+	var values string
+	if values, err = rs.db.Get(RATING_PROFILE_PREFIX + key); err == nil {
+		rp = new(RatingProfile)
+		err = rs.ms.Unmarshal([]byte(values), rp)
+	}
+	return
+}
+
+func (rs *GosexyStorage) SetRatingProfile(rp *RatingProfile) (err error) {
+	result, err := rs.ms.Marshal(rp)
+	_, err = rs.db.Set(RATING_PROFILE_PREFIX+rp.Id, result)
+	return
+}
+
+func (rs *GosexyStorage) GetDestination(key string) (dest *Destination, err error) {
+	var values string
+	if values, err = rs.db.Get(DESTINATION_PREFIX + key); err == nil {
+		dest = &Destination{Id: key}
+		err = rs.ms.Unmarshal([]byte(values), dest)
+	}
+	return
+}
+
+func (rs *GosexyStorage) SetDestination(dest *Destination) (err error) {
+	var result []byte
+	if result, err = rs.ms.Marshal(dest); err != nil {
+		return
+	}
+	_, err = rs.db.Set(DESTINATION_PREFIX+dest.Id, result)
+	return
+}
+
+func (rs *GosexyStorage) GetActions(key string) (as []*Action, err error) {
+	var values string
+	if values, err = rs.db.Get(ACTION_PREFIX + key); err == nil {
+		err = rs.ms.Unmarshal([]byte(values), &as)
+	}
+	return
+}
+
+func (rs *GosexyStorage) SetActions(key string, as []*Action) (err error) {
+	result, err := rs.ms.Marshal(as)
+	_, err = rs.db.Set(ACTION_PREFIX+key, result)
+	return
+}
+
+func (rs *GosexyStorage) GetUserBalance(key string) (ub *UserBalance, err error) {
+	var values string
+	if values, err = rs.db.Get(USER_BALANCE_PREFIX + key); err == nil {
+		ub = &UserBalance{Id: key}
+		err = rs.ms.Unmarshal([]byte(values), ub)
+	}
+
+	return
+}
+
+func (rs *GosexyStorage) SetUserBalance(ub *UserBalance) (err error) {
+	result, err := rs.ms.Marshal(ub)
+	_, err = rs.db.Set(USER_BALANCE_PREFIX+ub.Id, result)
+	return
+}
+
+func (rs *GosexyStorage) GetActionTimings(key string) (ats []*ActionTiming, err error) {
+	var values string
+	if values, err = rs.db.Get(ACTION_TIMING_PREFIX + key); err == nil {
+		err = rs.ms.Unmarshal([]byte(values), &ats)
+	}
+	return
+}
+
+func (rs *GosexyStorage) SetActionTimings(key string, ats []*ActionTiming) (err error) {
+	if len(ats) == 0 {
+		// delete the key
+		_, err = rs.db.Del(ACTION_TIMING_PREFIX + key)
+		return err
+	}
+	result, err := rs.ms.Marshal(ats)
+	_, err = rs.db.Set(ACTION_TIMING_PREFIX+key, result)
+	return
+}
+
+func (rs *GosexyStorage) GetAllActionTimings() (ats map[string][]*ActionTiming, err error) {
+	keys, err := rs.db.Keys(ACTION_TIMING_PREFIX + "*")
+	if err != nil {
+		return nil, err
+	}
+	ats = make(map[string][]*ActionTiming, len(keys))
+	for _, key := range keys {
+		values, err := rs.db.Get(key)
+		if err != nil {
+			continue
+		}
+		var tempAts []*ActionTiming
+		err = rs.ms.Unmarshal([]byte(values), &tempAts)
+		ats[key[len(ACTION_TIMING_PREFIX):]] = tempAts
+	}
+
+	return
+}
+
+func (rs *GosexyStorage) LogCallCost(uuid, source string, cc *CallCost) (err error) {
+	var result []byte
+	result, err = rs.ms.Marshal(cc)
+	if err != nil {
+		return
+	}
+	_, err = rs.db.Set(LOG_CALL_COST_PREFIX+source+"_"+uuid, result)
+	return
+}
+
+func (rs *GosexyStorage) GetCallCostLog(uuid, source string) (cc *CallCost, err error) {
+	var values string
+	if values, err = rs.db.Get(LOG_CALL_COST_PREFIX + source + "_" + uuid); err == nil {
+		err = rs.ms.Unmarshal([]byte(values), cc)
+	}
+	return
+}
+
+func (rs *GosexyStorage) LogActionTrigger(ubId, source string, at *ActionTrigger, as []*Action) (err error) {
+	mat, err := rs.ms.Marshal(at)
+	if err != nil {
+		return
+	}
+	mas, err := rs.ms.Marshal(as)
+	if err != nil {
+		return
+	}
+	rs.db.Set(LOG_ACTION_TRIGGER_PREFIX+source+"_"+time.Now().Format(time.RFC3339Nano), []byte(fmt.Sprintf("%s*%s*%s", ubId, string(mat), string(mas))))
+	return
+}
+
+func (rs *GosexyStorage) LogActionTiming(source string, at *ActionTiming, as []*Action) (err error) {
+	mat, err := rs.ms.Marshal(at)
+	if err != nil {
+		return
+	}
+	mas, err := rs.ms.Marshal(as)
+	if err != nil {
+		return
+	}
+	_, err = rs.db.Set(LOG_ACTION_TIMMING_PREFIX+source+"_"+time.Now().Format(time.RFC3339Nano), []byte(fmt.Sprintf("%s*%s", string(mat), string(mas))))
+	return
+}
+
+func (rs *GosexyStorage) LogError(uuid, source, errstr string) (err error) {
+	_, err = rs.db.Set(LOG_ERR+source+"_"+uuid, errstr)
+	return
+}

update_external_libs.sh

@@ -5,3 +5,5 @@ go get -v -u github.com/vmihailenco/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
+go get -u -v github.com/garyburd/redigo/redis
+go get -u -v menteslibres.net/gosexy/redis