From dd8ba0087fe33dbba107649b39533ec8d0253f23 Mon Sep 17 00:00:00 2001 From: DanB Date: Fri, 17 Feb 2017 21:10:54 +0100 Subject: [PATCH] Apier SetAccount reloading always scheduler for repetitive scenarios using same actionPlan --- apier/v1/accounts.go | 4 ++-- apier/v2/accounts.go | 2 +- .../{cdrs_onexp_it_test.go => cdrs_onlexp_it_test.go} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename general_tests/{cdrs_onexp_it_test.go => cdrs_onlexp_it_test.go} (100%) diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go index f886c4299..869a401a8 100644 --- a/apier/v1/accounts.go +++ b/apier/v1/accounts.go @@ -190,7 +190,7 @@ func (self *ApierV1) SetAccount(attr utils.AttrSetAccount, reply *string) (err e // clean previous action plans for i := 0; i < len(acntAPids); { apID := acntAPids[i] - if attr.ActionPlanId == apID { + if apID == attr.ActionPlanId { i++ // increase index since we don't remove from slice continue } @@ -276,7 +276,7 @@ func (self *ApierV1) SetAccount(attr utils.AttrSetAccount, reply *string) (err e if err != nil { return utils.NewErrServerError(err) } - if attr.ReloadScheduler && len(dirtyActionPlans) > 0 { + if attr.ReloadScheduler { sched := self.ServManager.GetScheduler() if sched == nil { return errors.New(utils.SchedulerNotRunningCaps) diff --git a/apier/v2/accounts.go b/apier/v2/accounts.go index b5dc5b645..117073219 100644 --- a/apier/v2/accounts.go +++ b/apier/v2/accounts.go @@ -227,7 +227,7 @@ func (self *ApierV2) SetAccount(attr AttrSetAccount, reply *string) error { if err != nil { return utils.NewErrServerError(err) } - if attr.ReloadScheduler && len(dirtyActionPlans) > 0 { + if attr.ReloadScheduler { sched := self.ServManager.GetScheduler() if sched == nil { return errors.New(utils.SchedulerNotRunningCaps) diff --git a/general_tests/cdrs_onexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go similarity index 100% rename from general_tests/cdrs_onexp_it_test.go rename to general_tests/cdrs_onlexp_it_test.go