uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Improved logging for the cache system, better help message for console get_cost

Browse Source
This commit is contained in:
DanB
2013-11-28 15:42:29 +01:00
parent 8e92c51da2
commit 6138a12974
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cgr-engine/cgr-engine.go
View File

@@ -327,12 +327,10 @@ func main() {
cfg.SchedulerEnabled = *schedEnabled
}
if cfg.RaterEnabled {
engine.Logger.Info("Starting redis pre-caching...")
if err := dataDb.PreCache(nil, nil); err != nil {
engine.Logger.Crit(fmt.Sprintf("Pre-caching error: %v", err))
return
}
engine.Logger.Info("Pre-caching done!")
}
if cfg.StorDBType == SAME {
logDb = dataDb.(engine.LogStorage)

9
console/get_cost.go
View File

@@ -63,16 +63,21 @@ func (self *CmdGetCost) FromArgs(args []string) error {
} else {
tStart,err = utils.ParseDate(args[6])
if err != nil {
fmt.Println("Cannot parse start time")
fmt.Println("\n*start_time* should have one of the formats:")
fmt.Println("\ttime.RFC3339\teg:2013-08-07T17:30:00Z in UTC")
fmt.Println("\tunix time\teg: 1383823746")
fmt.Println("\t*now\t\tmetafunction transformed into localtime at query time")
fmt.Println("\t+dur\t\tduration to be added to localtime (valid suffixes: ns, us/µs, ms, s, m, h)\n")
return fmt.Errorf(self.Usage(""))
}
}
if _, err := strconv.Atoi(args[7]); err == nil { // No suffix, default to seconds
fmt.Println("\n*duration* needs suffix, defaulting to *s* (valid suffixes: ns, us/µs, ms, s, m, h)\n")
args[7] += "s"
}
callDur, err := time.ParseDuration(args[7])
if err != nil {
fmt.Println("Cannot parse duration")
fmt.Println("\n\tExample durations: 60s for 60 seconds, 25m for 25minutes, 1m25s for one minute and 25 seconds\n")
return fmt.Errorf(self.Usage(""))
}
self.rpcParams.TOR = args[2]

12
engine/storage_redis.go
View File

@@ -68,9 +68,12 @@ func (rs *RedisStorage) Flush() (err error) {
func (rs *RedisStorage) PreCache(dKeys, rpKeys []string) (err error) {
if dKeys == nil {
Logger.Info("Caching all destinations")
if dKeys, err = rs.db.Keys(DESTINATION_PREFIX + "*"); err != nil {
return
}
} else if len(dKeys) != 0 {
Logger.Info(fmt.Sprintf("Caching destinations: %v", dKeys))
}
prefixLen := len(DESTINATION_PREFIX)
for _, key := range dKeys {
@@ -79,10 +82,16 @@ func (rs *RedisStorage) PreCache(dKeys, rpKeys []string) (err error) {
return err
}
}
if len(dKeys) != 0 {
Logger.Info("Finished destinations caching.")
}
if rpKeys == nil {
Logger.Info("Caching all rating plans")
if rpKeys, err = rs.db.Keys(RATING_PLAN_PREFIX + "*"); err != nil {
return
}
} else if len(rpKeys) != 0 {
Logger.Info(fmt.Sprintf("Caching rating plans: %v", rpKeys))
}
prefixLen = len(RATING_PLAN_PREFIX)
for _, key := range rpKeys {
@@ -91,6 +100,9 @@ func (rs *RedisStorage) PreCache(dKeys, rpKeys []string) (err error) {
return err
}
}
if len(rpKeys) != 0 {
Logger.Info("Finished rating plans caching.")
}
return
}