gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename reject_unknown to reject_unknown_cluster

Browse Source 
this is supposed to make it clearer what is being rejected

Signed-off-by: Matthias Hanel <mh@synadia.com>
This commit is contained in:
Matthias Hanel
2020-11-17 17:34:12 -05:00
parent 68416d291b
commit 3b4da21e07
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/monitor.go
View File

@@ -1065,7 +1065,7 @@ type GatewayOptsVarz struct {
Advertise string `json:"advertise,omitempty"`
ConnectRetries int `json:"connect_retries,omitempty"`
Gateways []RemoteGatewayOptsVarz `json:"gateways,omitempty"`
RejectUnknown bool `json:"reject_unknown,omitempty"`
RejectUnknown bool `json:"reject_unknown,omitempty"` // config got renamed to reject_unknown_cluster
}
// RemoteGatewayOptsVarz contains monitoring remote gateway information

4
server/opts.go
View File

@@ -92,7 +92,7 @@ type GatewayOpts struct {
Advertise string `json:"advertise,omitempty"`
ConnectRetries int `json:"connect_retries,omitempty"`
Gateways []*RemoteGatewayOpts `json:"gateways,omitempty"`
RejectUnknown bool `json:"reject_unknown,omitempty"`
RejectUnknown bool `json:"reject_unknown,omitempty"` // config got renamed to reject_unknown_cluster
// Not exported, for tests.
resolver netResolver
@@ -1285,7 +1285,7 @@ func parseGateway(v interface{}, o *Options, errors *[]error, warnings *[]error)
return err
}
o.Gateway.Gateways = gateways
case "reject_unknown":
case "reject_unknown", "reject_unknown_cluster":
o.Gateway.RejectUnknown = mv.(bool)
default:
if !tk.IsUsedVariable() {

4
server/opts_test.go
View File

@@ -1859,6 +1859,7 @@ func TestParsingGateways(t *testing.T) {
listen: "127.0.0.1:4444"
host: "127.0.0.1"
port: 4444
reject_unknown_cluster: true
authorization {
user: "ivan"
password: "pwd"
@@ -1903,6 +1904,7 @@ func TestParsingGateways(t *testing.T) {
Advertise: "me:1",
ConnectRetries: 10,
TLSTimeout: 3.0,
RejectUnknown: true,
}
u1, _ := url.Parse("nats://user1:pwd1@host2:5222")
u2, _ := url.Parse("nats://user1:pwd1@host3:6222")
@@ -1969,7 +1971,7 @@ func TestParsingGatewaysErrors(t *testing.T) {
`gateway {
name: "A"
port: -1
reject_unknown: true
reject_unknown_cluster: true
unknown_field: 1
}`,
"unknown field",