uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-21 23:28:44 +05:00
Code Issues Packages Projects Releases Wiki Activity

actions sorters

Browse Source
This commit is contained in:
Radu Ioan Fericean
2012-07-03 16:38:43 +03:00
parent 4dce1c216f
commit d8b86cb270
12 changed files with 324 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/cgr-balancer/cgr-balanncer.go
View File

@@ -27,21 +27,25 @@ import (
"log"
"runtime"
"time"
"sync"
)
var (
raterAddress = flag.String("rateraddr", "127.0.0.1:2000", "Rater server address (localhost:2000)")
jsonRpcAddress = flag.String("jsonrpcaddr", "127.0.0.1:2001", "Json RPC server address (localhost:2001)")
httpApiAddress = flag.String("httpapiaddr", "127.0.0.1:8000", "Http API server address (localhost:2002)")
freeswitchsrv = flag.String("freeswitchsrv", "localhost:8021", "freeswitch address host:port")
freeswitchpass = flag.String("freeswitchpass", "ClueCon", "freeswitch address host:port")
bal *balancer.Balancer
raterAddress = flag.String("rateraddr", "127.0.0.1:2000", "Rater server address (localhost:2000)")
jsonRpcAddress = flag.String("jsonrpcaddr", "127.0.0.1:2001", "Json RPC server address (localhost:2001)")
httpApiAddress = flag.String("httpapiaddr", "127.0.0.1:8000", "Http API server address (localhost:2002)")
freeswitchsrv = flag.String("freeswitchsrv", "localhost:8021", "freeswitch address host:port")
freeswitchpass = flag.String("freeswitchpass", "ClueCon", "freeswitch address host:port")
bal *balancer.Balancer
balancerRWMutex sync.RWMutex
)
/*
The function that gets the information from the raters using balancer.
*/
func GetCallCost(key *timespans.CallDescriptor, method string) (reply *timespans.CallCost) {
balancerRWMutex.RLock()
defer balancerRWMutex
err := errors.New("") //not nil value
for err != nil {
client := bal.Balance()

21
cmd/cgr-scheduler/cgr-scheduler.go
View File

@@ -40,25 +40,8 @@ var (
s = scheduler{}
)
/*
Structure to store action timings according to next activation time.
*/
type actiontimingqueue []*timespans.ActionTiming
func (atq actiontimingqueue) Len() int {
return len(atq)
}
func (atq actiontimingqueue) Swap(i, j int) {
atq[i], atq[j] = atq[j], atq[i]
}
func (atq actiontimingqueue) Less(j, i int) bool {
return atq[j].GetNextStartTime().Before(atq[i].GetNextStartTime())
}
type scheduler struct {
queue actiontimingqueue
queue timespans.ActionTimingPriotityList
}
func (s scheduler) loop() {
@@ -110,7 +93,7 @@ func loadActionTimings() {
log.Fatalf("Cannot get action timings:", err)
}
// recreate the queue
s.queue = actiontimingqueue{}
s.queue = timespans.ActionTimingPriotityList{}
for _, at := range actionTimings {
if at.IsOneTimeRun() {
log.Print("Executing: ", at)