From 2a00b1cd5e4fefe344123949a4df3281a5eb015e Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Wed, 30 Jun 2021 09:45:51 +0300 Subject: [PATCH] Fix typo (parralel->parallel) v0.10 --- config/config_defaults.go | 2 +- config/config_json_test.go | 2 +- config/config_test.go | 4 ++-- config/generalcfg.go | 8 ++++---- config/generalcfg_test.go | 4 ++-- config/libconfig_json.go | 2 +- config/multifiles_it_test.go | 2 +- data/conf/cgrates/cgrates.json | 2 +- engine/connmanager.go | 6 +++--- utils/consts.go | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config/config_defaults.go b/config/config_defaults.go index 2ba6f4b9c..7917ee84d 100755 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -51,7 +51,7 @@ const CGRATES_CFG_JSON = ` "digest_separator": ",", // separator to use in replies containing data digests "digest_equal": ":", // equal symbol used in case of digests "rsr_separator": ";", // separator used within RSR fields - "max_parralel_conns": 100, // the maximum number of connection used by the *parallel strategy + "max_parallel_conns": 100, // the maximum number of connection used by the *parallel strategy "concurrent_requests": 0, // number of active concurrent requests "concurrent_strategy": "*busy", // strategy for limit active concurrent requests }, diff --git a/config/config_json_test.go b/config/config_json_test.go index ed61005a0..be67ac73e 100755 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -61,7 +61,7 @@ func TestDfGeneralJsonCfg(t *testing.T) { Digest_separator: utils.StringPointer(","), Digest_equal: utils.StringPointer(":"), Rsr_separator: utils.StringPointer(";"), - Max_parralel_conns: utils.IntPointer(100), + Max_parallel_conns: utils.IntPointer(100), Concurrent_requests: utils.IntPointer(0), Concurrent_strategy: utils.StringPointer(utils.MetaBusy), } diff --git a/config/config_test.go b/config/config_test.go index 6ac92c470..e7964f01a 100755 --- a/config/config_test.go +++ b/config/config_test.go @@ -1902,7 +1902,7 @@ func TestGeneralCfg(t *testing.T) { "digest_separator": ",", "digest_equal": ":", "rsr_separator": ";", - "max_parralel_conns": 100, + "max_parallel_conns": 100, "concurrent_requests": 0, "concurrent_strategy": "", }, @@ -1931,7 +1931,7 @@ func TestGeneralCfg(t *testing.T) { "digest_separator": ",", "digest_equal": ":", "rsr_separator": ";", - "max_parralel_conns": 100, + "max_parallel_conns": 100, "concurrent_requests": 0, "concurrent_strategy": "", } diff --git a/config/generalcfg.go b/config/generalcfg.go index 9429a6783..edce19f7f 100644 --- a/config/generalcfg.go +++ b/config/generalcfg.go @@ -50,7 +50,7 @@ type GeneralCfg struct { DigestSeparator string // DigestEqual string // RSRSep string // separator used to split RSRParser (by degault is used ";") - MaxParralelConns int // the maximum number of connection used by the *parallel strategy + MaxParallelConns int // the maximum number of connections used by the *parallel strategy ConcurrentRequests int ConcurrentStrategy string } @@ -138,8 +138,8 @@ func (gencfg *GeneralCfg) loadFromJsonCfg(jsnGeneralCfg *GeneralJsonCfg) (err er if jsnGeneralCfg.Rsr_separator != nil { gencfg.RSRSep = *jsnGeneralCfg.Rsr_separator } - if jsnGeneralCfg.Max_parralel_conns != nil { - gencfg.MaxParralelConns = *jsnGeneralCfg.Max_parralel_conns + if jsnGeneralCfg.Max_parallel_conns != nil { + gencfg.MaxParallelConns = *jsnGeneralCfg.Max_parallel_conns } if jsnGeneralCfg.Concurrent_requests != nil { gencfg.ConcurrentRequests = *jsnGeneralCfg.Concurrent_requests @@ -193,7 +193,7 @@ func (gencfg *GeneralCfg) AsMapInterface() map[string]interface{} { utils.DigestSeparatorCfg: gencfg.DigestSeparator, utils.DigestEqualCfg: gencfg.DigestEqual, utils.RSRSepCfg: gencfg.RSRSep, - utils.MaxParralelConnsCfg: gencfg.MaxParralelConns, + utils.MaxParallelConnsCfg: gencfg.MaxParallelConns, utils.ConcurrentRequestsCfg: gencfg.ConcurrentRequests, utils.ConcurrentStrategyCfg: gencfg.ConcurrentStrategy, } diff --git a/config/generalcfg_test.go b/config/generalcfg_test.go index babd95564..a0ab27cb4 100644 --- a/config/generalcfg_test.go +++ b/config/generalcfg_test.go @@ -125,7 +125,7 @@ func TestGeneralCfgAsMapInterface(t *testing.T) { "digest_separator": ",", "digest_equal": ":", "rsr_separator": ";", - "max_parralel_conns": 100, + "max_parallel_conns": 100, "concurrent_requests": 0, "concurrent_strategy": "", }, @@ -154,7 +154,7 @@ func TestGeneralCfgAsMapInterface(t *testing.T) { "digest_separator": ",", "digest_equal": ":", "rsr_separator": ";", - "max_parralel_conns": 100, + "max_parallel_conns": 100, "concurrent_requests": 0, "concurrent_strategy": "", } diff --git a/config/libconfig_json.go b/config/libconfig_json.go index c5bcfbbe9..3555c76c7 100755 --- a/config/libconfig_json.go +++ b/config/libconfig_json.go @@ -43,7 +43,7 @@ type GeneralJsonCfg struct { Digest_separator *string Digest_equal *string Rsr_separator *string - Max_parralel_conns *int + Max_parallel_conns *int Concurrent_requests *int Concurrent_strategy *string } diff --git a/config/multifiles_it_test.go b/config/multifiles_it_test.go index b079e2f9c..499828b38 100644 --- a/config/multifiles_it_test.go +++ b/config/multifiles_it_test.go @@ -103,7 +103,7 @@ func TestMfEnvReaderITRead(t *testing.T) { DigestSeparator: ",", DigestEqual: ":", RSRSep: ";", - MaxParralelConns: 100, + MaxParallelConns: 100, FailedPostsTTL: 5 * time.Second, ConcurrentStrategy: utils.MetaBusy, } diff --git a/data/conf/cgrates/cgrates.json b/data/conf/cgrates/cgrates.json index 1dbb70e7f..e0fd78c0f 100755 --- a/data/conf/cgrates/cgrates.json +++ b/data/conf/cgrates/cgrates.json @@ -30,7 +30,7 @@ // "digest_separator": ",", // separator to use in replies containing data digests // "digest_equal": ":", // equal symbol used in case of digests // "rsr_separator": ";", // separator used within RSR fields -// "max_parralel_conns": 100, // the maximum number of connection used by the *parallel strategy +// "max_parallel_conns": 100, // the maximum number of connection used by the *parallel strategy // "concurrent_requests": 0, // number of active concurrent requests // "concurrent_strategy": "*busy", // strategy for limit active concurrent requests // }, diff --git a/engine/connmanager.go b/engine/connmanager.go index bbe8f272c..d847f9997 100644 --- a/engine/connmanager.go +++ b/engine/connmanager.go @@ -80,14 +80,14 @@ func (cM *ConnManager) getConn(connID string, biRPCClient rpcclient.ClientConnec return } case connCfg.Strategy == rpcclient.PoolParallel: - rpcConnCfg := connCfg.Conns[0] // for parrallel we need only the first connection + rpcConnCfg := connCfg.Conns[0] // for parallel we need only the first connection var conPool *rpcclient.RPCParallelClientPool if rpcConnCfg.Address == utils.MetaInternal { conPool, err = rpcclient.NewRPCParallelClientPool("", "", rpcConnCfg.TLS, 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, rpcclient.InternalRPC, intChan, int64(cM.cfg.GeneralCfg().MaxParralelConns), false) + cM.cfg.GeneralCfg().ReplyTimeout, rpcclient.InternalRPC, intChan, int64(cM.cfg.GeneralCfg().MaxParallelConns), false) } else if utils.SliceHasMember([]string{utils.EmptyString, utils.MetaGOB, utils.MetaJSON}, rpcConnCfg.Transport) { codec := rpcclient.GOBrpc if rpcConnCfg.Transport != "" { @@ -97,7 +97,7 @@ func (cM *ConnManager) getConn(connID string, biRPCClient rpcclient.ClientConnec 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, codec, nil, int64(cM.cfg.GeneralCfg().MaxParralelConns), false) + cM.cfg.GeneralCfg().ReplyTimeout, codec, nil, int64(cM.cfg.GeneralCfg().MaxParallelConns), false) } else { err = fmt.Errorf("Unsupported transport: <%s>", rpcConnCfg.Transport) } diff --git a/utils/consts.go b/utils/consts.go index 112c73b46..2c3ef9690 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -1595,7 +1595,7 @@ const ( DigestSeparatorCfg = "digest_separator" DigestEqualCfg = "digest_equal" RSRSepCfg = "rsr_separator" - MaxParralelConnsCfg = "max_parralel_conns" + MaxParallelConnsCfg = "max_parallel_conns" ConcurrentRequestsCfg = "concurrent_requests" ConcurrentStrategyCfg = "concurrent_strategy" )