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

Handle error better in Call from ConnManager

Browse Source
This commit is contained in:
TeoV
2019-12-03 09:10:43 -05:00
parent 63e6e42847
commit 522cf0ac78
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/connmanager.go
View File

@@ -51,13 +51,12 @@ func (cM *ConnManager) getConn(connID string) (connPool *rpcclient.RpcClientPool
} else {
connCfg = cM.cfg.RPCConns()[connID]
}
connPool, err = NewRPCPool(connCfg.Strategy,
if connPool, err = NewRPCPool(connCfg.Strategy,
cM.cfg.TlsCfg().ClientKey,
cM.cfg.TlsCfg().ClientCerificate, cM.cfg.TlsCfg().CaCertificate,
cM.cfg.GeneralCfg().ConnectAttempts, cM.cfg.GeneralCfg().Reconnects,
cM.cfg.GeneralCfg().ConnectTimeout, cM.cfg.GeneralCfg().ReplyTimeout,
connCfg.Conns, intChan, false)
if err != nil {
connCfg.Conns, intChan, false); err != nil {
return
}
Cache.Set(utils.CacheRPCConnections, connID, connPool, nil,
@@ -66,13 +65,12 @@ func (cM *ConnManager) getConn(connID string) (connPool *rpcclient.RpcClientPool
}
func (cM *ConnManager) Call(connIDs []string, method string, arg, reply interface{}) (err error) {
var conn *rpcclient.RpcClientPool
for _, connID := range connIDs {
conn, err := cM.getConn(connID)
if err == nil {
if err := conn.Call(method, arg, reply); err != nil {
return err
}
if conn, err = cM.getConn(connID); err != nil {
continue
}
return conn.Call(method, arg, reply)
}
return nil
return
}