all tests passing

timespans/calldesc.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"github.com/rif/cache2go"
-	"log"
 	"log/syslog"
 	"math"
 	"time"
@@ -92,7 +91,7 @@ func (cd *CallDescriptor) GetUserBalanceKey() string {
 	if cd.Account != "" {
 		subj = cd.Account
 	}
-	return ACCOUNT_PREFIX + fmt.Sprintf("%s:%s:%s", cd.Direction, cd.Tenant, subj)
+	return fmt.Sprintf("%s:%s:%s", cd.Direction, cd.Tenant, subj)
 }
 
 /*
@@ -151,7 +150,6 @@ func (cd *CallDescriptor) LoadActivationPeriods() (destPrefix string, err error)
 }
 
 func (cd *CallDescriptor) getActivationPeriodsForPrefix(key string, recursionDepth int) (foundPrefix string, aps []*ActivationPeriod, err error) {
-	log.Print("Search: ", key)
 	if recursionDepth > RECURSION_MAX_DEPTH {
 		err = errors.New("Max fallback recursion depth reached!" + key)
 		return

timespans/storage_interface.go

@@ -26,7 +26,6 @@ import (
 )
 
 const (
-	ACCOUNT_PREFIX       = "account:"
 	ACTION_TIMING_PREFIX = "acttmg:"
 	CALL_COST_LOG_PREFIX = "cc:"
 	LOG_PREFIX           = "log:"