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

Renamed GetSetCGRID to GetSetOptsOriginID

Browse Source
This commit is contained in:
andronache98
2022-01-21 14:28:40 +02:00
committed by Dan Christian Bogos
parent 9a56e57452
commit 06d075304b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sessions/libsessions.go
View File

@@ -51,8 +51,8 @@ type BiRPClient interface {
V1WarnDisconnect(ctx *context.Context, args map[string]interface{}, reply *string) (err error)
}
// GetSetCGRID will populate the CGRID key if not present and return it
func GetSetCGRID(ev engine.MapEvent, opt map[string]interface{}) (cgrID string) {
// GetSetOptsOriginID will populate the CGRID key if not present and return it
func GetSetOptsOriginID(ev engine.MapEvent, opt map[string]interface{}) (cgrID string) {
fldIface, has := opt[utils.MetaOriginID]
if has {
cgrID = utils.IfaceAsString(fldIface)

12
sessions/sessions.go
View File

@@ -906,7 +906,7 @@ func (sS *SessionS) newSession(ctx *context.Context, cgrEv *utils.CGREvent, resI
err = errors.New("ChargerS is disabled")
return
}
cgrID := GetSetCGRID(cgrEv.Event, cgrEv.APIOpts)
cgrID := GetSetOptsOriginID(cgrEv.Event, cgrEv.APIOpts)
evStart := engine.MapEvent(cgrEv.Event)
if !evStart.HasField(utils.Usage) && evStart.HasField(utils.LastUsed) {
evStart[utils.Usage] = evStart[utils.LastUsed]
@@ -2001,7 +2001,7 @@ func (sS *SessionS) BiRPCv1UpdateSession(ctx *context.Context,
config.SessionsDebitIntervalDftOpt, utils.OptsSesDebitInterval); err != nil {
return err
}
cgrID := GetSetCGRID(ev, args.APIOpts)
cgrID := GetSetOptsOriginID(ev, args.APIOpts)
s := sS.getRelocateSession(ctx, cgrID,
ev.GetStringIgnoreErrors(utils.InitialOriginID),
ev.GetStringIgnoreErrors(utils.OriginID),
@@ -2085,7 +2085,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(ctx *context.Context,
ev := engine.MapEvent(args.Event)
opts := engine.MapEvent(args.APIOpts)
cgrID := GetSetCGRID(ev, opts)
cgrID := GetSetOptsOriginID(ev, opts)
originID := ev.GetStringIgnoreErrors(utils.OriginID)
if termS {
if originID == "" {
@@ -2742,7 +2742,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context,
// return err //utils.NewErrRALs(err)
// }
// }
// s := sS.getRelocateSession(GetSetCGRID(ev),
// s := sS.getRelocateSession(GetSetOptsOriginID(ev),
// ev.GetStringIgnoreErrors(utils.InitialOriginID),
// ev.GetStringIgnoreErrors(utils.OriginID),
// ev.GetStringIgnoreErrors(utils.OriginHost))
@@ -2764,7 +2764,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(ctx *context.Context,
// return err //utils.NewErrRALs(err)
// }
// }
// s := sS.getRelocateSession(GetSetCGRID(ev),
// s := sS.getRelocateSession(GetSetOptsOriginID(ev),
// ev.GetStringIgnoreErrors(utils.InitialOriginID),
// ev.GetStringIgnoreErrors(utils.OriginID),
// ev.GetStringIgnoreErrors(utils.OriginHost))
@@ -2928,7 +2928,7 @@ func (sS *SessionS) BiRPCv1DeactivateSessions(ctx *context.Context,
func (sS *SessionS) processCDR(ctx *context.Context, cgrEv *utils.CGREvent, rply *string) (err error) {
ev := engine.MapEvent(cgrEv.Event)
cgrID := GetSetCGRID(ev, cgrEv.APIOpts)
cgrID := GetSetOptsOriginID(ev, cgrEv.APIOpts)
s := sS.getRelocateSession(ctx, cgrID,
ev.GetStringIgnoreErrors(utils.InitialOriginID),
ev.GetStringIgnoreErrors(utils.OriginID),