From e3083471b16dbfbef5b4464084dd07d0b45ae11c Mon Sep 17 00:00:00 2001 From: TeoV Date: Thu, 25 Jan 2018 13:37:24 +0200 Subject: [PATCH] Replacing SMGeneric/SMG from logs with utils.SessionS --- config/config.go | 14 +++++++------- sessionmanager/smg_session.go | 6 +++--- sessionmanager/smgeneric.go | 20 ++++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/config/config.go b/config/config.go index f8fa9f1b6..89e9d4816 100755 --- a/config/config.go +++ b/config/config.go @@ -472,34 +472,34 @@ func (self *CGRConfig) checkConfigSanity() error { // SMGeneric checks if self.sessionSCfg.Enabled { if len(self.sessionSCfg.RALsConns) == 0 { - return errors.New(" RALs definition is mandatory!") + return errors.New(" RALs definition is mandatory!") } for _, smgRALsConn := range self.sessionSCfg.RALsConns { if smgRALsConn.Address == utils.MetaInternal && !self.RALsEnabled { - return errors.New(" RALs not enabled but requested by SMGeneric component.") + return errors.New(" RALs not enabled but requested by SMGeneric component.") } } for _, conn := range self.sessionSCfg.ResSConns { if conn.Address == utils.MetaInternal && !self.resourceSCfg.Enabled { - return errors.New(" ResourceS not enabled but requested by SMGeneric component.") + return errors.New(" ResourceS not enabled but requested by SMGeneric component.") } } for _, conn := range self.sessionSCfg.SupplSConns { if conn.Address == utils.MetaInternal && !self.supplierSCfg.Enabled { - return errors.New(" SupplierS not enabled but requested by SMGeneric component.") + return errors.New(" SupplierS not enabled but requested by SMGeneric component.") } } for _, conn := range self.sessionSCfg.AttrSConns { if conn.Address == utils.MetaInternal && !self.attributeSCfg.Enabled { - return errors.New(" AttributeS not enabled but requested by SMGeneric component.") + return errors.New(" AttributeS not enabled but requested by SMGeneric component.") } } if len(self.sessionSCfg.CDRsConns) == 0 { - return errors.New(" CDRs definition is mandatory!") + return errors.New(" CDRs definition is mandatory!") } for _, smgCDRSConn := range self.sessionSCfg.CDRsConns { if smgCDRSConn.Address == utils.MetaInternal && !self.CDRSEnabled { - return errors.New(" CDRS not enabled but referenced by SMGeneric component") + return errors.New(" CDRS not enabled but referenced by SMGeneric component") } } } diff --git a/sessionmanager/smg_session.go b/sessionmanager/smg_session.go index 514d4650d..7185aa603 100644 --- a/sessionmanager/smg_session.go +++ b/sessionmanager/smg_session.go @@ -63,19 +63,19 @@ func (self *SMGSession) debitLoop(debitInterval time.Duration) { return case <-time.After(sleepDur): if maxDebit, err := self.debit(debitInterval, nil); err != nil { - utils.Logger.Err(fmt.Sprintf(" Could not complete debit operation on session: %s, error: %s", self.CGRID, err.Error())) + utils.Logger.Err(fmt.Sprintf("<%s> Could not complete debit operation on session: %s, error: %s", utils.SessionS, self.CGRID, err.Error())) disconnectReason := utils.ErrServerError.Error() if err.Error() == utils.ErrUnauthorizedDestination.Error() { disconnectReason = err.Error() } if err := self.disconnectSession(disconnectReason); err != nil { - utils.Logger.Err(fmt.Sprintf(" Could not disconnect session: %s, error: %s", self.CGRID, err.Error())) + utils.Logger.Err(fmt.Sprintf("<%s> Could not disconnect session: %s, error: %s", utils.SessionS, self.CGRID, err.Error())) } return } else if maxDebit < debitInterval { time.Sleep(maxDebit) if err := self.disconnectSession(utils.ErrInsufficientCredit.Error()); err != nil { - utils.Logger.Err(fmt.Sprintf(" Could not disconnect session: %s, error: %s", self.CGRID, err.Error())) + utils.Logger.Err(fmt.Sprintf("<%s> Could not disconnect session: %s, error: %s", utils.SessionS, self.CGRID, err.Error())) } return } diff --git a/sessionmanager/smgeneric.go b/sessionmanager/smgeneric.go index ba5072c71..4d29b14db 100644 --- a/sessionmanager/smgeneric.go +++ b/sessionmanager/smgeneric.go @@ -261,7 +261,7 @@ func (smg *SMGeneric) indexSession(s *SMGSession, passiveSessions bool) { if err == utils.ErrNotFound { fieldVal = utils.NOT_AVAILABLE } else { - utils.Logger.Err(fmt.Sprintf(" Error retrieving field: %s from event: %+v", fieldName, s.EventStart)) + utils.Logger.Err(fmt.Sprintf("<%s> Error retrieving field: %s from event: %+v", utils.SessionS, fieldName, s.EventStart)) continue } } @@ -410,7 +410,7 @@ func (smg *SMGeneric) sessionStart(evStart SMGenericEvent, rals: smg.rals, cdrsrv: smg.cdrsrv, CD: sessionRun.CallDescriptor, clntConn: clntConn} smg.recordASession(s) - //utils.Logger.Info(fmt.Sprintf(" Starting session: %s, runId: %s", sessionId, s.runId)) + //utils.Logger.Info(fmt.Sprintf("<%s> Starting session: %s, runId: %s",utils.SessionS, sessionId, s.runId)) if smg.cgrCfg.SessionSCfg().DebitInterval != 0 { s.stopDebit = stopDebitChan go s.debitLoop(smg.cgrCfg.SessionSCfg().DebitInterval) @@ -443,15 +443,15 @@ func (smg *SMGeneric) sessionEnd(cgrID string, usage time.Duration) error { } aTime, err := s.EventStart.GetAnswerTime(utils.META_DEFAULT, smg.Timezone) if err != nil || aTime.IsZero() { - utils.Logger.Err(fmt.Sprintf(" Could not retrieve answer time for session: %s, runId: %s, aTime: %+v, error: %v", - cgrID, s.RunID, aTime, err)) + utils.Logger.Err(fmt.Sprintf("<%s> Could not retrieve answer time for session: %s, runId: %s, aTime: %+v, error: %v", + utils.SessionS, cgrID, s.RunID, aTime, err)) continue // Unanswered session } if err := s.close(usage); err != nil { - utils.Logger.Err(fmt.Sprintf(" Could not close session: %s, runId: %s, error: %s", cgrID, s.RunID, err.Error())) + utils.Logger.Err(fmt.Sprintf("<%s> Could not close session: %s, runId: %s, error: %s", utils.SessionS, cgrID, s.RunID, err.Error())) } if err := s.storeSMCost(); err != nil { - utils.Logger.Err(fmt.Sprintf(" Could not save session: %s, runId: %s, error: %s", cgrID, s.RunID, err.Error())) + utils.Logger.Err(fmt.Sprintf("<%s> Could not save session: %s, runId: %s, error: %s", utils.SessionS, cgrID, s.RunID, err.Error())) } } return nil, nil @@ -768,7 +768,7 @@ func (smg *SMGeneric) UpdateSession(gev SMGenericEvent, clnt rpcclient.RpcClient aSessions := smg.getSessions(cgrID, false) if len(aSessions) == 0 { if aSessions = smg.passiveToActive(cgrID); len(aSessions) == 0 { - utils.Logger.Err(fmt.Sprintf(" SessionUpdate with no active sessions for event: <%s>", cgrID)) + utils.Logger.Err(fmt.Sprintf("<%s> SessionUpdate with no active sessions for event: <%s>", utils.SessionS, cgrID)) err = rpcclient.ErrSessionNotFound return } @@ -839,7 +839,7 @@ func (smg *SMGeneric) TerminateSession(gev SMGenericEvent, clnt rpcclient.RpcCli aSessions := smg.getSessions(sessionID, false) if len(aSessions) == 0 { if aSessions = smg.passiveToActive(cgrID); len(aSessions) == 0 { - utils.Logger.Err(fmt.Sprintf(" SessionTerminate with no active sessions for cgrID: <%s>", cgrID)) + utils.Logger.Err(fmt.Sprintf("<%s> SessionTerminate with no active sessions for cgrID: <%s>", utils.SessionS, cgrID)) continue } } @@ -878,7 +878,7 @@ func (smg *SMGeneric) ChargeEvent(gev SMGenericEvent) (maxUsage time.Duration, e for _, sR := range sessionRuns { cc := new(engine.CallCost) if err = smg.rals.Call("Responder.MaxDebit", sR.CallDescriptor, cc); err != nil { - utils.Logger.Err(fmt.Sprintf(" Could not Debit CD: %+v, RunID: %s, error: %s", sR.CallDescriptor, sR.DerivedCharger.RunID, err.Error())) + utils.Logger.Err(fmt.Sprintf("<%s> Could not Debit CD: %+v, RunID: %s, error: %s", utils.SessionS, sR.CallDescriptor, sR.DerivedCharger.RunID, err.Error())) break } sR.CallCosts = append(sR.CallCosts, cc) // Save it so we can revert on issues @@ -955,7 +955,7 @@ func (smg *SMGeneric) ChargeEvent(gev SMGenericEvent) (maxUsage time.Duration, e if errStore := smg.cdrsrv.Call("CdrsV1.StoreSMCost", engine.AttrCDRSStoreSMCost{Cost: smCost, CheckDuplicate: true}, &reply); errStore != nil && !strings.HasSuffix(errStore.Error(), utils.ErrExists.Error()) { withErrors = true - utils.Logger.Err(fmt.Sprintf(" Could not save CC: %+v, RunID: %s error: %s", cc, sR.DerivedCharger.RunID, errStore.Error())) + utils.Logger.Err(fmt.Sprintf("<%s> Could not save CC: %+v, RunID: %s error: %s", utils.SessionS, cc, sR.DerivedCharger.RunID, errStore.Error())) } } if withErrors {