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

MaxReconnectInterval now gets converted to time.Duration directly

Browse Source
This commit is contained in:
ionutboangiu
2022-05-25 16:49:23 +03:00
committed by Dan Christian Bogos
parent d3fb55fedb
commit 31c0e784b7
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/kamagentcfg.go
View File

@@ -19,6 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package config
import (
"time"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/rpcclient"
)
@@ -37,12 +39,12 @@ type KamConnCfg struct {
Alias string
Address string
Reconnects int
MaxReconnectInterval string
MaxReconnectInterval time.Duration
}
func (kamCfg *KamConnCfg) loadFromJSONCfg(jsnCfg *KamConnJsonCfg) error {
func (kamCfg *KamConnCfg) loadFromJSONCfg(jsnCfg *KamConnJsonCfg) (err error) {
if jsnCfg == nil {
return nil
return
}
if jsnCfg.Address != nil {
kamCfg.Address = *jsnCfg.Address
@@ -54,9 +56,11 @@ func (kamCfg *KamConnCfg) loadFromJSONCfg(jsnCfg *KamConnJsonCfg) error {
kamCfg.Reconnects = *jsnCfg.Reconnects
}
if jsnCfg.MaxReconnectInterval != nil {
kamCfg.MaxReconnectInterval = *jsnCfg.MaxReconnectInterval
if kamCfg.MaxReconnectInterval, err = utils.ParseDurationWithNanosecs(*jsnCfg.MaxReconnectInterval); err != nil {
return
}
}
return nil
return
}
// AsMapInterface returns the config as a map[string]interface{}

26
config/sessionscfg.go
View File

@@ -41,13 +41,13 @@ type FsConnCfg struct {
Address string
Password string
Reconnects int
MaxReconnectInterval string
MaxReconnectInterval time.Duration
Alias string
}
func (fs *FsConnCfg) loadFromJSONCfg(jsnCfg *FsConnJsonCfg) error {
func (fs *FsConnCfg) loadFromJSONCfg(jsnCfg *FsConnJsonCfg) (err error) {
if jsnCfg == nil {
return nil
return
}
if jsnCfg.Address != nil {
fs.Address = *jsnCfg.Address
@@ -59,14 +59,16 @@ func (fs *FsConnCfg) loadFromJSONCfg(jsnCfg *FsConnJsonCfg) error {
fs.Reconnects = *jsnCfg.Reconnects
}
if jsnCfg.MaxReconnectInterval != nil {
fs.MaxReconnectInterval = *jsnCfg.MaxReconnectInterval
if fs.MaxReconnectInterval, err = utils.ParseDurationWithNanosecs(*jsnCfg.MaxReconnectInterval); err != nil {
return
}
}
fs.Alias = fs.Address
if jsnCfg.Alias != nil && *jsnCfg.Alias != "" {
fs.Alias = *jsnCfg.Alias
}
return nil
return
}
// AsMapInterface returns the config as a map[string]interface{}
@@ -711,12 +713,12 @@ type AsteriskConnCfg struct {
Password string
ConnectAttempts int
Reconnects int
MaxReconnectInterval string
MaxReconnectInterval time.Duration
}
func (aConnCfg *AsteriskConnCfg) loadFromJSONCfg(jsnCfg *AstConnJsonCfg) error {
func (aConnCfg *AsteriskConnCfg) loadFromJSONCfg(jsnCfg *AstConnJsonCfg) (err error) {
if jsnCfg == nil {
return nil
return
}
if jsnCfg.Address != nil {
aConnCfg.Address = *jsnCfg.Address
@@ -737,9 +739,11 @@ func (aConnCfg *AsteriskConnCfg) loadFromJSONCfg(jsnCfg *AstConnJsonCfg) error {
aConnCfg.Reconnects = *jsnCfg.Reconnects
}
if jsnCfg.MaxReconnectInterval != nil {
aConnCfg.MaxReconnectInterval = *jsnCfg.MaxReconnectInterval
if aConnCfg.MaxReconnectInterval, err = utils.ParseDurationWithNanosecs(*jsnCfg.MaxReconnectInterval); err != nil {
return
}
}
return nil
return
}
// AsMapInterface returns the config as a map[string]interface{}
@@ -751,7 +755,7 @@ func (aConnCfg *AsteriskConnCfg) AsMapInterface() map[string]interface{} {
utils.Password: aConnCfg.Password,
utils.ConnectAttemptsCfg: aConnCfg.ConnectAttempts,
utils.ReconnectsCfg: aConnCfg.Reconnects,
utils.MaxReconnectIntervalCfg: aConnCfg.MaxReconnectInterval,
utils.MaxReconnectIntervalCfg: aConnCfg.MaxReconnectInterval.String(),
}
}