diff --git a/cmd/cgr-console/cgr-console.go b/cmd/cgr-console/cgr-console.go index 8cca58fb3..48f23332d 100644 --- a/cmd/cgr-console/cgr-console.go +++ b/cmd/cgr-console/cgr-console.go @@ -45,7 +45,7 @@ var ( certificatePath = cgrConsoleFlags.String("crt_path", "", "path to certificate for tls connection") keyPath = cgrConsoleFlags.String("key_path", "", "path to key for tls connection") caPath = cgrConsoleFlags.String("ca_path", "", "path to CA for tls connection(only for self sign certificate)") - tls = cgrConsoleFlags.Bool("tls", false, "Tls connection") + tls = cgrConsoleFlags.Bool("tls", false, "TLS connection") client *rpcclient.RpcClient ) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index e6d5101fc..7974b696d 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -308,7 +308,7 @@ func main() { if len(ldrCfg.LoaderCgrCfg().CachesConns) != 0 { // Init connection to CacheS so we can reload it's data if cacheS, err = rpcclient.NewRpcClient("tcp", ldrCfg.LoaderCgrCfg().CachesConns[0].Address, - ldrCfg.LoaderCgrCfg().CachesConns[0].Tls, ldrCfg.TlsCfg().ClientKey, + ldrCfg.LoaderCgrCfg().CachesConns[0].TLS, ldrCfg.TlsCfg().ClientKey, ldrCfg.TlsCfg().ClientCerificate, ldrCfg.TlsCfg().CaCertificate, 3, 3, time.Duration(1*time.Second), time.Duration(5*time.Minute), strings.TrimPrefix(ldrCfg.LoaderCgrCfg().CachesConns[0].Transport, utils.Meta), @@ -323,7 +323,7 @@ func main() { if len(ldrCfg.LoaderCgrCfg().SchedulerConns) != 0 { // Init connection to Scheduler so we can reload it's data if schedulerS, err = rpcclient.NewRpcClient("tcp", ldrCfg.LoaderCgrCfg().SchedulerConns[0].Address, - ldrCfg.LoaderCgrCfg().SchedulerConns[0].Tls, ldrCfg.TlsCfg().ClientKey, + ldrCfg.LoaderCgrCfg().SchedulerConns[0].TLS, ldrCfg.TlsCfg().ClientKey, ldrCfg.TlsCfg().ClientCerificate, ldrCfg.TlsCfg().CaCertificate, 3, 3, time.Duration(1*time.Second), time.Duration(5*time.Minute), strings.TrimPrefix(ldrCfg.LoaderCgrCfg().SchedulerConns[0].Transport, utils.Meta), diff --git a/config/smconfig.go b/config/smconfig.go index 101598cfc..aee262919 100644 --- a/config/smconfig.go +++ b/config/smconfig.go @@ -38,7 +38,7 @@ type RemoteHost struct { Address string Transport string Synchronous bool - Tls bool + TLS bool } func (self *RemoteHost) loadFromJsonCfg(jsnCfg *HaPoolJsonCfg) error { @@ -55,7 +55,7 @@ func (self *RemoteHost) loadFromJsonCfg(jsnCfg *HaPoolJsonCfg) error { self.Synchronous = *jsnCfg.Synchronous } if jsnCfg.Tls != nil { - self.Tls = *jsnCfg.Tls + self.TLS = *jsnCfg.Tls } return nil } diff --git a/engine/dispatcherprfl.go b/engine/dispatcherprfl.go index c2e523e57..c1a055a54 100644 --- a/engine/dispatcherprfl.go +++ b/engine/dispatcherprfl.go @@ -126,7 +126,7 @@ func (dps DispatcherProfiles) Sort() { type DispatcherHostConn struct { Address string Transport string - Tls bool + TLS bool } type DispatcherHost struct { Tenant string diff --git a/engine/libengine.go b/engine/libengine.go index b3253b7f0..89157bdeb 100644 --- a/engine/libengine.go +++ b/engine/libengine.go @@ -44,14 +44,14 @@ func NewRPCPool(dispatchStrategy string, keyPath, certPath, caPath string, connA case <-time.After(ttl): return nil, errors.New("TTL triggered") } - rpcClient, err = rpcclient.NewRpcClient("", "", rpcConnCfg.Tls, keyPath, certPath, caPath, connAttempts, + rpcClient, err = rpcclient.NewRpcClient("", "", rpcConnCfg.TLS, keyPath, certPath, caPath, connAttempts, reconnects, connectTimeout, replyTimeout, rpcclient.INTERNAL_RPC, internalConn, lazyConnect) } else if utils.IsSliceMember([]string{utils.MetaJSONrpc, utils.MetaGOBrpc, ""}, rpcConnCfg.Transport) { codec := utils.GOB if rpcConnCfg.Transport != "" { codec = rpcConnCfg.Transport[1:] // Transport contains always * before codec understood by rpcclient } - rpcClient, err = rpcclient.NewRpcClient("tcp", rpcConnCfg.Address, rpcConnCfg.Tls, keyPath, certPath, caPath, + rpcClient, err = rpcclient.NewRpcClient("tcp", rpcConnCfg.Address, rpcConnCfg.TLS, keyPath, certPath, caPath, connAttempts, reconnects, connectTimeout, replyTimeout, codec, nil, lazyConnect) } else { return nil, fmt.Errorf("Unsupported transport: <%s>", rpcConnCfg.Transport) diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index d463ebf35..497e67dd4 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -271,7 +271,7 @@ cgrates.org,D1,*any,*string:Account:1001,2014-07-29T15:00:00Z,*first,,C1,*gt:Usa cgrates.org,D1,,,,*first,,C2,*lt:Usage:10,10,false,192.168.56.204, ` dispatcherHosts = ` -#Tenant[0],ID[1],Address[2],Transport[3],Tls[4] +#Tenant[0],ID[1],Address[2],Transport[3],TLS[4] cgrates.org,ALL1,127.0.0.1:2012,*json,true cgrates.org,ALL1,127.0.0.1:3012,*json,false ` @@ -1643,12 +1643,12 @@ func TestLoadDispatcherHosts(t *testing.T) { &utils.TPDispatcherHostConn{ Address: "127.0.0.1:2012", Transport: utils.MetaJSONrpc, - Tls: true, + TLS: true, }, &utils.TPDispatcherHostConn{ Address: "127.0.0.1:3012", Transport: utils.MetaJSONrpc, - Tls: false, + TLS: false, }, }, } diff --git a/engine/model_helpers.go b/engine/model_helpers.go index 7450bcbc0..0bc4de3dc 100644 --- a/engine/model_helpers.go +++ b/engine/model_helpers.go @@ -2618,7 +2618,7 @@ func (tps TPDispatcherHosts) AsTPDispatcherHosts() (result []*utils.TPDispatcher { Address: tp.Address, Transport: tp.Transport, - Tls: tp.Tls, + TLS: tp.TLS, }, }, } @@ -2627,7 +2627,7 @@ func (tps TPDispatcherHosts) AsTPDispatcherHosts() (result []*utils.TPDispatcher hostsMap[tenantID].Conns = append(hostsMap[tenantID].Conns, &utils.TPDispatcherHostConn{ Address: tp.Address, Transport: tp.Transport, - Tls: tp.Tls, + TLS: tp.TLS, }) } for _, host := range hostsMap { @@ -2648,7 +2648,7 @@ func APItoModelTPDispatcherHost(tpDPH *utils.TPDispatcherHost) (mdls TPDispatche ID: tpDPH.ID, Address: conn.Address, Transport: conn.Transport, - Tls: conn.Tls, + TLS: conn.TLS, } } return @@ -2667,7 +2667,7 @@ func APItoDispatcherHost(tpDPH *utils.TPDispatcherHost) (dpp *DispatcherHost) { dpp.Conns[i] = &DispatcherHostConn{ Address: conn.Address, Transport: conn.Transport, - Tls: conn.Tls, + TLS: conn.TLS, } } return diff --git a/engine/models.go b/engine/models.go index 79dffd9b2..842ab0c3e 100644 --- a/engine/models.go +++ b/engine/models.go @@ -412,6 +412,6 @@ type TPDispatcherHost struct { ID string `index:"1" re:""` Address string `index:"2" re:""` Transport string `index:"3" re:""` - Tls bool `index:"4" re:""` + TLS bool `index:"4" re:""` CreatedAt time.Time } diff --git a/sessions/sessions.go b/sessions/sessions.go index f58620eca..50c0eace8 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -52,7 +52,7 @@ func NewSReplConns(conns []*config.RemoteHost, reconnects int, connTimeout, replyTimeout time.Duration) (sReplConns []*SReplConn, err error) { sReplConns = make([]*SReplConn, len(conns)) for i, replConnCfg := range conns { - if replCon, err := rpcclient.NewRpcClient("tcp", replConnCfg.Address, replConnCfg.Tls, "", "", "", 0, reconnects, + if replCon, err := rpcclient.NewRpcClient("tcp", replConnCfg.Address, replConnCfg.TLS, "", "", "", 0, reconnects, connTimeout, replyTimeout, replConnCfg.Transport[1:], nil, true); err != nil { return nil, err } else { diff --git a/utils/apitpdata.go b/utils/apitpdata.go index 9e22ff5e1..f67fc24b9 100755 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -1209,7 +1209,7 @@ type TPDispatcherProfile struct { type TPDispatcherHostConn struct { Address string Transport string - Tls bool + TLS bool } // TPDispatcherHostTPDispatcherHost is used in APIs to manage remotely offline DispatcherHost