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

Add sanity check for Session Replicate Connection

Browse Source
This commit is contained in:
TeoV
2020-01-08 05:02:28 -05:00
parent 771a1245d8
commit e565370c50
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/config_defaults.go
View File

@@ -56,7 +56,6 @@ const CGRATES_CFG_JSON = `
"rpc_conns": {
"*localhost": {
"strategy": "*first",
"conns": [{"address": "127.0.0.1:2012", "transport":"*json"}],
},
}, // rpc connections definitions

2
config/config_it_test.go
View File

@@ -358,7 +358,7 @@ func TestCGRConfigReloadSessionS(t *testing.T) {
AttrSConns: []string{utils.MetaLocalHost},
CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)},
ReplicationConns: []*RemoteHost{},
ReplicationConns: []string{},
MaxCallDuration: 3 * time.Hour,
SessionIndexes: utils.NewStringMap(),
ClientProtocol: 1,

5
config/configsanity.go
View File

@@ -207,6 +207,11 @@ func (cfg *CGRConfig) checkConfigSanity() error {
return fmt.Errorf("<%s> Connection with id: <%s> not defined", utils.SessionS, connID)
}
}
for _, connID := range cfg.sessionSCfg.ReplicationConns {
if _, has := cfg.rpcConns[connID]; !has {
return fmt.Errorf("<%s> Connection with id: <%s> not defined", utils.SessionS, connID)
}
}
if cfg.cacheCfg[utils.CacheClosedSessions].Limit == 0 {
return fmt.Errorf("<%s> %s needs to be != 0, received: %d", utils.CacheS, utils.CacheClosedSessions, cfg.cacheCfg[utils.CacheClosedSessions].Limit)
}

4
data/conf/samples/dispatchers/all/cgrates.json
View File

@@ -27,6 +27,10 @@
"strategy": "*first",
"conns": [{"address": "127.0.0.1:6012", "transport":"*json"}],
},
"rplConn": {
"strategy": "*broadcast_sync",
"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}],
}
},

2
data/conf/samples/sessions_replication/smgreplcslave/cgrates.json
View File

@@ -19,7 +19,7 @@
"conns": [{"address": "127.0.0.1:22012", "transport":"*json"}],
},
"rplConn": {
"strategy": "*broadcast_sync",
"strategy": "*broadcast",
"conns": [{"address": "127.0.0.1:2012", "transport": "*json"}],
}
},

8
dispatchers/sessions_it_test.go
View File

@@ -28,7 +28,6 @@ import (
"testing"
"time"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/sessions"
"github.com/cgrates/cgrates/utils"
@@ -705,12 +704,7 @@ func testDspSessionReplicate(t *testing.T) {
ArgsReplicateSessions: sessions.ArgsReplicateSessions{
CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf",
Passive: false,
Connections: []*config.RemoteHost{
&config.RemoteHost{
Address: "127.0.0.1:7012",
Transport: utils.MetaJSON,
},
},
ConnIDs: []string{"rplConn"},
},
}, &reply); err != nil {
t.Fatal(err)