From 63e6e428471d03301d76ecf7046805877b369a8b Mon Sep 17 00:00:00 2001 From: TeoV Date: Tue, 3 Dec 2019 07:18:08 -0500 Subject: [PATCH] Remove logs from debugging --- engine/connmanager.go | 8 -------- ers/ers.go | 16 +--------------- ers/filecsv_it_test.go | 4 ++-- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/engine/connmanager.go b/engine/connmanager.go index fef592f73..6fc6891e0 100644 --- a/engine/connmanager.go +++ b/engine/connmanager.go @@ -19,8 +19,6 @@ along with this program. If not, see package engine import ( - "fmt" - "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/utils" "github.com/cgrates/rpcclient" @@ -28,8 +26,6 @@ import ( // NewConnManager returns the Connection Manager func NewConnManager(cfg *config.CGRConfig, rpcInternal map[string]chan rpcclient.RpcClientConnection) (cM *ConnManager) { - fmt.Println("Enter in engine NewConn Manager") - fmt.Println(rpcInternal) return &ConnManager{cfg: cfg, rpcInternal: rpcInternal} } @@ -49,10 +45,6 @@ func (cM *ConnManager) getConn(connID string) (connPool *rpcclient.RpcClientPool // in case we don't found in cache create the connection and add this in cache var intChan chan rpcclient.RpcClientConnection var connCfg *config.RPCConn - fmt.Println("TEST ?? ") - fmt.Println(cM) - fmt.Println(cM.rpcInternal) - fmt.Println(connID) if internalChan, has := cM.rpcInternal[connID]; has { connCfg = cM.cfg.RPCConns()[utils.MetaInternal] intChan = internalChan diff --git a/ers/ers.go b/ers/ers.go index bbc0da8d9..8be3327f8 100644 --- a/ers/ers.go +++ b/ers/ers.go @@ -193,10 +193,8 @@ func (erS *ERService) processEvent(cgrEv *utils.CGREvent, rdrCfg *config.EventRe cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator, ) rply := new(sessions.V1AuthorizeReply) - fmt.Println("Call Auth") err = erS.connMgr.Call(erS.cfg.ERsCfg().SessionSConns, utils.SessionSv1AuthorizeEvent, authArgs, rply) - fmt.Println(" Finish Call Auth") case utils.MetaInitiate: initArgs := sessions.NewV1InitSessionArgs( rdrCfg.Flags.HasKey(utils.MetaAttributes), @@ -209,10 +207,8 @@ func (erS *ERService) processEvent(cgrEv *utils.CGREvent, rdrCfg *config.EventRe rdrCfg.Flags.HasKey(utils.MetaAccounts), cgrEv, cgrArgs.ArgDispatcher) rply := new(sessions.V1InitSessionReply) - fmt.Println("Call Init") err = erS.connMgr.Call(erS.cfg.ERsCfg().SessionSConns, utils.SessionSv1InitiateSession, initArgs, rply) - fmt.Println(" Finish Call Init") case utils.MetaUpdate: updateArgs := sessions.NewV1UpdateSessionArgs( rdrCfg.Flags.HasKey(utils.MetaAttributes), @@ -220,10 +216,8 @@ func (erS *ERService) processEvent(cgrEv *utils.CGREvent, rdrCfg *config.EventRe rdrCfg.Flags.HasKey(utils.MetaAccounts), cgrEv, cgrArgs.ArgDispatcher) rply := new(sessions.V1UpdateSessionReply) - fmt.Println("Call Update") err = erS.connMgr.Call(erS.cfg.ERsCfg().SessionSConns, utils.SessionSv1UpdateSession, updateArgs, rply) - fmt.Println(" Finish Call Update") case utils.MetaTerminate: terminateArgs := sessions.NewV1TerminateSessionArgs( rdrCfg.Flags.HasKey(utils.MetaAccounts), @@ -234,10 +228,8 @@ func (erS *ERService) processEvent(cgrEv *utils.CGREvent, rdrCfg *config.EventRe rdrCfg.Flags.ParamsSlice(utils.MetaStats), cgrEv, cgrArgs.ArgDispatcher) rply := utils.StringPointer("") - fmt.Println("Call Terminate") err = erS.connMgr.Call(erS.cfg.ERsCfg().SessionSConns, utils.SessionSv1TerminateSession, terminateArgs, rply) - fmt.Println(" Finish Call Terminate") case utils.MetaMessage: evArgs := sessions.NewV1ProcessMessageArgs( rdrCfg.Flags.HasKey(utils.MetaAttributes), @@ -253,10 +245,8 @@ func (erS *ERService) processEvent(cgrEv *utils.CGREvent, rdrCfg *config.EventRe rdrCfg.Flags.HasKey(utils.MetaSuppliersEventCost), cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator) rply := new(sessions.V1ProcessMessageReply) // need it so rpcclient can clone - fmt.Println("Call ProcMsg") err = erS.connMgr.Call(erS.cfg.ERsCfg().SessionSConns, utils.SessionSv1ProcessMessage, evArgs, rply) - fmt.Println("Finish Call ProcMsg") if utils.ErrHasPrefix(err, utils.RalsErrorPrfx) { cgrEv.Event[utils.Usage] = 0 // avoid further debits } else if evArgs.Debit { @@ -270,10 +260,8 @@ func (erS *ERService) processEvent(cgrEv *utils.CGREvent, rdrCfg *config.EventRe Paginator: *cgrArgs.SupplierPaginator, } rply := new(sessions.V1ProcessEventReply) - fmt.Println("Call Event") err = erS.connMgr.Call(erS.cfg.ERsCfg().SessionSConns, utils.SessionSv1ProcessEvent, evArgs, rply) - fmt.Println("Finish Call Event") case utils.MetaCDRs: // allow CDR processing } if err != nil { @@ -283,11 +271,9 @@ func (erS *ERService) processEvent(cgrEv *utils.CGREvent, rdrCfg *config.EventRe if rdrCfg.Flags.HasKey(utils.MetaCDRs) && !rdrCfg.Flags.HasKey(utils.MetaDryRun) { rplyCDRs := utils.StringPointer("") - fmt.Println("Call cdrs") err = erS.connMgr.Call(erS.cfg.ERsCfg().SessionSConns, utils.SessionSv1ProcessCDR, &utils.CGREventWithArgDispatcher{CGREvent: cgrEv, - ArgDispatcher: cgrArgs.ArgDispatcher}, &rplyCDRs) - fmt.Println("finish Call cdrs") + ArgDispatcher: cgrArgs.ArgDispatcher}, rplyCDRs) } return diff --git a/ers/filecsv_it_test.go b/ers/filecsv_it_test.go index 4b411d05f..34e9ab294 100644 --- a/ers/filecsv_it_test.go +++ b/ers/filecsv_it_test.go @@ -62,7 +62,7 @@ accid23;*rated;cgrates.org;1001;086517174963;2013-02-03 19:54:00;26;val_extra3;" testCsvITInitConfig, testCsvITInitCdrDb, testCsvITResetDataDb, - //testCsvITStartEngine, + testCsvITStartEngine, testCsvITRpcConn, testCsvITLoadTPFromFolder, testCsvITHandleCdr1File, @@ -75,7 +75,7 @@ accid23;*rated;cgrates.org;1001;086517174963;2013-02-03 19:54:00;26;val_extra3;" testCsvITProcessFilteredCDR, testCsvITAnalyzeFilteredCDR, testCsvITProcessedFiles, - //testCsvITCleanupFiles, + testCsvITCleanupFiles, testCsvITKillEngine, } )