From 892cbdf6f04da8082258c39cbb27cc0efea3721c Mon Sep 17 00:00:00 2001 From: andronache Date: Tue, 29 Jun 2021 09:30:52 +0300 Subject: [PATCH] Finished replacing error in case of missing flags in agents with warning --- agents/asterisk_event.go | 4 ++-- agents/fsevent.go | 4 ++++ agents/kamevent.go | 6 ++++++ data/ansible/calls/freeswitch/main.yaml | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/agents/asterisk_event.go b/agents/asterisk_event.go index 16d72b7f0..db711bf2e 100644 --- a/agents/asterisk_event.go +++ b/agents/asterisk_event.go @@ -311,7 +311,7 @@ func (smaEv *SMAsteriskEvent) V1InitSessionArgs(cgrEvDisp utils.CGREvent) (args } subsystems, err := cgrEvDisp.FieldAsString(utils.CGRFlags) if err != nil { - utils.Logger.Err(fmt.Sprintf("<%s> event: %s don't have %s variable", + utils.Logger.Warning(fmt.Sprintf("<%s> event: %s don't have %s variable", utils.AsteriskAgent, utils.ToJSON(cgrEvDisp), utils.CGRFlags)) args.InitSession = true return @@ -326,7 +326,7 @@ func (smaEv *SMAsteriskEvent) V1TerminateSessionArgs(cgrEvDisp utils.CGREvent) ( } subsystems, err := cgrEvDisp.FieldAsString(utils.CGRFlags) if err != nil { - utils.Logger.Err(fmt.Sprintf("<%s> event: %s don't have %s variable", + utils.Logger.Warning(fmt.Sprintf("<%s> event: %s don't have %s variable", utils.AsteriskAgent, utils.ToJSON(cgrEvDisp), utils.CGRFlags)) args.TerminateSession = true return diff --git a/agents/fsevent.go b/agents/fsevent.go index 8a82b3b3c..753bd3131 100644 --- a/agents/fsevent.go +++ b/agents/fsevent.go @@ -429,6 +429,8 @@ func (fsev FSEvent) V1InitSessionArgs() (args *sessions.V1InitSessionArgs) { } subsystems, has := fsev[VarCGRFlags] if !has { + utils.Logger.Warning(fmt.Sprintf("<%s> cgr_flags variable is not set, using defaults", + utils.FreeSWITCHAgent)) args.InitSession = true return } @@ -447,6 +449,8 @@ func (fsev FSEvent) V1TerminateSessionArgs() (args *sessions.V1TerminateSessionA } subsystems, has := fsev[VarCGRFlags] if !has { + utils.Logger.Warning(fmt.Sprintf("<%s> cgr_flags variable is not set, using defaults", + utils.FreeSWITCHAgent)) args.TerminateSession = true return } diff --git a/agents/kamevent.go b/agents/kamevent.go index b375255aa..4d1542c15 100644 --- a/agents/kamevent.go +++ b/agents/kamevent.go @@ -276,6 +276,8 @@ func (kev KamEvent) V1InitSessionArgs() (args *sessions.V1InitSessionArgs) { } subsystems, has := kev[utils.CGRFlags] if !has { + utils.Logger.Warning(fmt.Sprintf("<%s> cgr_flags is not set, using defaults", + utils.FreeSWITCHAgent)) args.InitSession = true return } @@ -295,6 +297,8 @@ func (kev KamEvent) V1ProcessMessageArgs() (args *sessions.V1ProcessMessageArgs) } subsystems, has := kev[utils.CGRFlags] if !has { + utils.Logger.Warning(fmt.Sprintf("<%s> cgr_flags is not set, using defaults", + utils.FreeSWITCHAgent)) return } args.ParseFlags(subsystems, utils.InfieldSep) @@ -391,6 +395,8 @@ func (kev KamEvent) V1TerminateSessionArgs() (args *sessions.V1TerminateSessionA } subsystems, has := kev[utils.CGRFlags] if !has { + utils.Logger.Warning(fmt.Sprintf("<%s> cgr_flags is not set, using defaults", + utils.FreeSWITCHAgent)) return } args.ParseFlags(subsystems, utils.InfieldSep) diff --git a/data/ansible/calls/freeswitch/main.yaml b/data/ansible/calls/freeswitch/main.yaml index 113d8357b..6a9afd4b1 100644 --- a/data/ansible/calls/freeswitch/main.yaml +++ b/data/ansible/calls/freeswitch/main.yaml @@ -82,8 +82,8 @@ ########################################################################################################################### # Install and config CGRateS - #- name: Install and config CGRateS - # include: cgrates.yaml + - name: Install and config CGRateS + include: cgrates.yaml # Configure FreeSwitch - name: Unzip FreeSWITCH config