From 064bbfc92fbab77cdff854d96c283a334ee7cf48 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 31 Jul 2015 18:07:08 +0300 Subject: [PATCH] apier load tp from folder to load users --- apier/v1/apier.go | 8 ++++++++ cmd/cgr-loader/cgr-loader.go | 16 ++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/apier/v1/apier.go b/apier/v1/apier.go index ef8dd9890..53c30828c 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -1116,6 +1116,14 @@ func (self *ApierV1) LoadTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder, return err } } + + userKeys, _ := loader.GetLoadedIds(utils.USERS) + if len(userKeys) != 0 && self.Users != nil { + var r string + if err := self.Users.ReloadUsers("", &r); err != nil { + return err + } + } *reply = "OK" return nil } diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 0aa4f8cd6..d6681708e 100644 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -288,12 +288,16 @@ func main() { } if users != nil { - if *verbose { - log.Print("Reloading Users data") - } - var reply string - if err := cdrstats.Call("UsersV1.ReloadUsers", "", &reply); err != nil { - log.Printf("WARNING: Failed reloading users data, error: %s\n", err.Error()) + userIds, _ := tpReader.GetLoadedIds(utils.USERS_PREFIX) + if len(userIds) > 0 { + if *verbose { + log.Print("Reloading Users data") + } + var reply string + if err := cdrstats.Call("UsersV1.ReloadUsers", "", &reply); err != nil { + log.Printf("WARNING: Failed reloading users data, error: %s\n", err.Error()) + } + } } }