uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-17 22:29:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

Resove merge problems

Browse Source
This commit is contained in:
TeoV
2019-05-27 15:45:39 +03:00
committed by Dan Christian Bogos
parent 0987fb79db
commit 570db82c35
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dispatchers/thresholds.go
View File

@@ -57,15 +57,11 @@ func (dS *DispatcherService) ThresholdSv1GetThresholdsForEvent(args *engine.Args
return
}
}
<<<<<<< HEAD
var routeID *string
if args.ArgDispatcher != nil {
routeID = args.ArgDispatcher.RouteID
}
return dS.Dispatch(&args.CGREvent, utils.MetaThresholds, routeID,
=======
return dS.Dispatch(args.CGREvent, utils.MetaThresholds, args.RouteID,
>>>>>>> Replacing CGREvent with *CGRevent when inherited for ThresholdService
return dS.Dispatch(args.CGREvent, utils.MetaThresholds, routeID,
utils.ThresholdSv1GetThresholdsForEvent, args, t)
}
@@ -81,15 +77,11 @@ func (dS *DispatcherService) ThresholdSv1ProcessEvent(args *engine.ArgsProcessEv
return
}
}
<<<<<<< HEAD
var routeID *string
if args.ArgDispatcher != nil {
routeID = args.ArgDispatcher.RouteID
}
return dS.Dispatch(&args.CGREvent, utils.MetaThresholds, routeID,
=======
return dS.Dispatch(args.CGREvent, utils.MetaThresholds, args.RouteID,
>>>>>>> Replacing CGREvent with *CGRevent when inherited for ThresholdService
return dS.Dispatch(args.CGREvent, utils.MetaThresholds, routeID,
utils.ThresholdSv1ProcessEvent, args, tIDs)
}