From 2767a6a3d55bd01343445dff5f1750daa985d716 Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 1 Apr 2019 18:36:41 +0200 Subject: [PATCH] Removing static hosts from DispatcherS --- cmd/cgr-engine/cgr-engine.go | 20 +------------------- config/config.go | 12 ------------ config/config_defaults.go | 2 -- config/config_json_test.go | 1 - config/config_test.go | 1 - config/dispatchercfg.go | 15 --------------- config/libconfig_json.go | 1 - dispatchers/dispatchers.go | 8 +++----- 8 files changed, 4 insertions(+), 56 deletions(-) diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 471de43bc..f184b704d 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -944,25 +944,7 @@ func startDispatcherService(internalDispatcherSChan chan *dispatchers.Dispatcher return } } - conns := make(map[string]*rpcclient.RpcClientPool) - for connID, haPoolCfg := range cfg.DispatcherSCfg().Conns { - var connPool *rpcclient.RpcClientPool - if connPool, err = engine.NewRPCPool( - rpcclient.POOL_FIRST, - cfg.TlsCfg().ClientKey, - cfg.TlsCfg().ClientCerificate, cfg.TlsCfg().CaCertificate, - cfg.GeneralCfg().ConnectAttempts, cfg.GeneralCfg().Reconnects, - cfg.GeneralCfg().ConnectTimeout, cfg.GeneralCfg().ReplyTimeout, - haPoolCfg, nil, time.Duration(0), false); err != nil { - utils.Logger.Crit( - fmt.Sprintf("<%s> could not connect to connID: <%s>, err: <%s>", - utils.DispatcherS, connID, err.Error())) - exitChan <- true - return - } - conns[connID] = connPool - } - dspS, err := dispatchers.NewDispatcherService(dm, cfg, fltrS, attrSConn, conns) + dspS, err := dispatchers.NewDispatcherService(dm, cfg, fltrS, attrSConn) if err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not init, error: %s", utils.DispatcherS, err.Error())) exitChan <- true diff --git a/config/config.go b/config/config.go index 8675d2511..eb7d4800b 100755 --- a/config/config.go +++ b/config/config.go @@ -687,18 +687,6 @@ func (self *CGRConfig) checkConfigSanity() error { if self.attributeSCfg.Enabled { return fmt.Errorf("<%s> cannot start in tandem with <%s>", utils.DispatcherS, utils.AttributeS) } - if len(self.dispatcherSCfg.Conns) == 0 { - return fmt.Errorf("<%s> no connections defined", utils.DispatcherS) - } - for connID, haPool := range self.dispatcherSCfg.Conns { - for _, connCfg := range haPool { - if connCfg.Address == utils.MetaInternal { - return fmt.Errorf( - "<%s> connID: <%s> %s connections are not supported", - utils.DispatcherS, connID, utils.MetaInternal) - } - } - } } // Scheduler check connection with CDR Server if !self.cdrsCfg.CDRSEnabled { diff --git a/config/config_defaults.go b/config/config_defaults.go index 637be123e..d127db4bd 100755 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -743,8 +743,6 @@ const CGRATES_CFG_JSON = ` //"string_indexed_fields": [], // query indexes based on these fields for faster processing "prefix_indexed_fields": [], // query indexes based on these fields for faster processing "attributes_conns": [], // connections to AttributeS for API authorization, empty to disable auth functionality: <""|*internal|x.y.z.y:1234> - "conns": { // connection pools to use for dispatching requests - }, }, diff --git a/config/config_json_test.go b/config/config_json_test.go index 2b97ffad0..69a3f079d 100755 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -1414,7 +1414,6 @@ func TestDfDispatcherSJsonCfg(t *testing.T) { String_indexed_fields: nil, Prefix_indexed_fields: &[]string{}, Attributes_conns: &[]*HaPoolJsonCfg{}, - Conns: &map[string]*[]*HaPoolJsonCfg{}, } if cfg, err := dfCgrJsonCfg.DispatcherSJsonCfg(); err != nil { t.Error(err) diff --git a/config/config_test.go b/config/config_test.go index be5447202..27b3fa46d 100755 --- a/config/config_test.go +++ b/config/config_test.go @@ -1476,7 +1476,6 @@ func TestCgrCfgJSONDefaultDispatcherSCfg(t *testing.T) { StringIndexedFields: nil, PrefixIndexedFields: &[]string{}, AttributeSConns: []*RemoteHost{}, - Conns: map[string][]*RemoteHost{}, } if !reflect.DeepEqual(cgrCfg.dispatcherSCfg, eDspSCfg) { t.Errorf("received: %+v, expecting: %+v", cgrCfg.dispatcherSCfg, eDspSCfg) diff --git a/config/dispatchercfg.go b/config/dispatchercfg.go index 6015c9fcc..e8a0ab296 100755 --- a/config/dispatchercfg.go +++ b/config/dispatchercfg.go @@ -25,7 +25,6 @@ type DispatcherSCfg struct { StringIndexedFields *[]string PrefixIndexedFields *[]string AttributeSConns []*RemoteHost - Conns map[string][]*RemoteHost } func (dps *DispatcherSCfg) loadFromJsonCfg(jsnCfg *DispatcherSJsonCfg) (err error) { @@ -59,19 +58,5 @@ func (dps *DispatcherSCfg) loadFromJsonCfg(jsnCfg *DispatcherSJsonCfg) (err erro dps.AttributeSConns[idx].loadFromJsonCfg(jsnHaCfg) } } - if jsnCfg.Conns != nil { - dps.Conns = make(map[string][]*RemoteHost, len(*jsnCfg.Conns)) - for id, conns := range *jsnCfg.Conns { - if conns == nil { - continue - } - Conns := make([]*RemoteHost, len(*conns)) - for idx, jsnHaCfg := range *conns { - Conns[idx] = NewDfltRemoteHost() - Conns[idx].loadFromJsonCfg(jsnHaCfg) - } - dps.Conns[id] = Conns - } - } return nil } diff --git a/config/libconfig_json.go b/config/libconfig_json.go index 7f617d387..7e06b5d97 100755 --- a/config/libconfig_json.go +++ b/config/libconfig_json.go @@ -527,7 +527,6 @@ type DispatcherSJsonCfg struct { String_indexed_fields *[]string Prefix_indexed_fields *[]string Attributes_conns *[]*HaPoolJsonCfg - Conns *map[string]*[]*HaPoolJsonCfg } type LoaderCfgJson struct { diff --git a/dispatchers/dispatchers.go b/dispatchers/dispatchers.go index 1d6da800b..4640341ef 100755 --- a/dispatchers/dispatchers.go +++ b/dispatchers/dispatchers.go @@ -32,13 +32,12 @@ import ( // NewDispatcherService constructs a DispatcherService func NewDispatcherService(dm *engine.DataManager, cfg *config.CGRConfig, fltrS *engine.FilterS, - attrS *rpcclient.RpcClientPool, - conns map[string]*rpcclient.RpcClientPool) (*DispatcherService, error) { + attrS *rpcclient.RpcClientPool) (*DispatcherService, error) { if attrS != nil && reflect.ValueOf(attrS).IsNil() { attrS = nil } return &DispatcherService{dm: dm, cfg: cfg, - fltrS: fltrS, attrS: attrS, conns: conns}, nil + fltrS: fltrS, attrS: attrS}, nil } // DispatcherService is the service handling dispatching towards internal components @@ -47,8 +46,7 @@ type DispatcherService struct { dm *engine.DataManager cfg *config.CGRConfig fltrS *engine.FilterS - attrS *rpcclient.RpcClientPool // used for API auth - conns map[string]*rpcclient.RpcClientPool // available connections, accessed based on connID + attrS *rpcclient.RpcClientPool // used for API auth } // ListenAndServe will initialize the service