From 7950cc8a7d7d1871535509ecc36799ad3b0fce7a Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Wed, 26 May 2021 17:14:28 +0300 Subject: [PATCH] Context for routes methods --- apis/routes.go | 2 +- engine/datamanager.go | 2 +- engine/tpreader.go | 2 +- loaders/loader.go | 2 +- migrator/routes.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apis/routes.go b/apis/routes.go index e02d116d8..dc1822985 100644 --- a/apis/routes.go +++ b/apis/routes.go @@ -100,7 +100,7 @@ func (adms *AdminSv1) RemoveRouteProfile(ctx *context.Context, args *utils.Tenan if tnt == utils.EmptyString { tnt = adms.cfg.GeneralCfg().DefaultTenant } - if err := adms.dm.RemoveRouteProfile(ctx, tnt, args.ID, utils.NonTransactional, true); err != nil { + if err := adms.dm.RemoveRouteProfile(ctx, tnt, args.ID, true); err != nil { return utils.APIErrorHandler(err) } //generate a loadID for CacheRouteProfiles and store it in database diff --git a/engine/datamanager.go b/engine/datamanager.go index 48f9b95bb..621c004f5 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -1268,7 +1268,7 @@ func (dm *DataManager) SetRouteProfile(ctx *context.Context, rpp *RouteProfile, return } -func (dm *DataManager) RemoveRouteProfile(tenant, id string, withIndex bool) (err error) { +func (dm *DataManager) RemoveRouteProfile(ctx *context.Context, tenant, id string, withIndex bool) (err error) { if dm == nil { return utils.ErrNoDatabaseConn } diff --git a/engine/tpreader.go b/engine/tpreader.go index 523a546c1..7cba5b4ff 100644 --- a/engine/tpreader.go +++ b/engine/tpreader.go @@ -757,7 +757,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disableReverse bool) (err error log.Print("RouteProfiles:") } for _, tpSpl := range tpr.routeProfiles { - if err = tpr.dm.RemoveRouteProfile(tpSpl.Tenant, tpSpl.ID, true); err != nil { + if err = tpr.dm.RemoveRouteProfile(context.TODO(), tpSpl.Tenant, tpSpl.ID, true); err != nil { return } if verbose { diff --git a/loaders/loader.go b/loaders/loader.go index 424c7866a..1f54afa03 100644 --- a/loaders/loader.go +++ b/loaders/loader.go @@ -823,7 +823,7 @@ func (ldr *Loader) removeLoadedData(ctx *context.Context, loaderType string, lds tntIDStruct := utils.NewTenantID(tntID) // get IDs so we can reload in cache ids = append(ids, tntID) - if err := ldr.dm.RemoveRouteProfile(tntIDStruct.Tenant, + if err := ldr.dm.RemoveRouteProfile(ctx, tntIDStruct.Tenant, tntIDStruct.ID, true); err != nil { return err } diff --git a/migrator/routes.go b/migrator/routes.go index ca93c5ac5..f94ee3bfa 100644 --- a/migrator/routes.go +++ b/migrator/routes.go @@ -130,7 +130,7 @@ func (m *Migrator) migrateCurrentRouteProfile() (err error) { if err := m.dmOut.DataManager().SetRouteProfile(context.TODO(), rPrf, true); err != nil { return err } - if err := m.dmIN.DataManager().RemoveRouteProfile(tntID[0], tntID[1], true); err != nil { + if err := m.dmIN.DataManager().RemoveRouteProfile(context.TODO(), tntID[0], tntID[1], true); err != nil { return err } m.stats[utils.Routes]++