From db08f7e14620cb1cb5f3359b7f2fb6d52ebddaab Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Wed, 10 Oct 2012 11:49:53 +0300 Subject: [PATCH] better loging --- rater/action_timing.go | 2 +- sessionmanager/fssessionmanager.go | 7 +++---- sessionmanager/session.go | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rater/action_timing.go b/rater/action_timing.go index 56c753f21..066eca922 100644 --- a/rater/action_timing.go +++ b/rater/action_timing.go @@ -197,7 +197,7 @@ func (at *ActionTiming) getUserBalances() (ubs []*UserBalance) { for _, ubId := range at.UserBalanceIds { ub, err := storageGetter.GetUserBalance(ubId) if err != nil { - Logger.Warning(fmt.Sprintf("Could not get user balances for therse id: %v. Skipping!", ubId)) + Logger.Warning(fmt.Sprintf("Could not get user balances for therse id: %s. Skipping!", ubId)) } ubs = append(ubs, ub) } diff --git a/sessionmanager/fssessionmanager.go b/sessionmanager/fssessionmanager.go index 6524461e9..582519b6f 100644 --- a/sessionmanager/fssessionmanager.go +++ b/sessionmanager/fssessionmanager.go @@ -95,8 +95,8 @@ func (sm *FSSessionManager) GetSession(uuid string) *Session { // Disconnects a session by sending hangup command to freeswitch func (sm *FSSessionManager) DisconnectSession(s *Session, notify string) { - rater.Logger.Debug(fmt.Sprintf("Session: %+v", s)) - err := fsock.SendApiCmd(fmt.Sprintf("api uuid_setvar %s cgr_notify %s\n\n", s.uuid, notify)) + rater.Logger.Debug(fmt.Sprintf("Session: %+v", s.uuid)) + err := fsock.SendApiCmd(fmt.Sprintf("uuid_setvar %s cgr_notify %s\n\n", s.uuid, notify)) if err != nil { rater.Logger.Err("could not send disconect api notification to freeswitch") } @@ -171,7 +171,6 @@ func (sm *FSSessionManager) OnChannelAnswer(ev Event) { if s != nil { sm.sessions = append(sm.sessions, s) } - rater.Logger.Debug(fmt.Sprintf("sessions: %v", sm.sessions)) } func (sm *FSSessionManager) OnChannelHangupComplete(ev Event) { @@ -280,6 +279,7 @@ func (sm *FSSessionManager) OnChannelHangupComplete(ev Event) { } lastCC.Cost -= cost rater.Logger.Info(fmt.Sprintf("Rambursed %v cents, %v seconds", cost, seconds)) + s.SaveOperations() } func (sm *FSSessionManager) LoopAction(s *Session, cd *rater.CallDescriptor) { @@ -313,7 +313,6 @@ func (sm *FSSessionManager) GetDbLogger() rater.DataStorage { func (sm *FSSessionManager) Shutdown() (err error) { rater.Logger.Info("Shutting down all sessions...") - rater.Logger.Debug(fmt.Sprintf("sessions: %v", sm.sessions)) for _, s := range sm.sessions { sm.DisconnectSession(s, MANAGER_REQUEST) } diff --git a/sessionmanager/session.go b/sessionmanager/session.go index 5ffc5112e..061be8664 100644 --- a/sessionmanager/session.go +++ b/sessionmanager/session.go @@ -107,6 +107,7 @@ func (s *Session) GetSessionDuration() time.Duration { // Stops the debit loop func (s *Session) Close() { + rater.Logger.Debug(fmt.Sprintf("Stopping debit for %s", s.uuid)) if s == nil { return }