Allow same external server mapping

everesio · everesio · commit 514fe7474594 · 2018-02-27T08:30:22.000+01:00
diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -57,8 +57,11 @@ func NewListeners(cfg *config.Config) (*Listeners, error) {
 
 	// add mapping without starting local listeners
 	for _, v := range cfg.Proxy.ExternalServers {
-		if _, ok := brokerToListenerAddresses[v.BrokerAddress]; ok {
-			return nil, fmt.Errorf("broker to listener address mapping %s configured twice", v.BrokerAddress)
+		if la, ok := brokerToListenerAddresses[v.BrokerAddress]; ok {
+			if la != v.ListenerAddress {
+				return nil, fmt.Errorf("broker to listener address mapping %s configured twice: %s and %s", v.BrokerAddress, v.ListenerAddress, la)
+			}
+			continue
 		}
 		brokerToListenerAddresses[v.BrokerAddress] = v.ListenerAddress
 	}

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,11 @@ func NewListeners(cfg config.Config) (Listeners, error) {`
`57`	`57`
`58`	`58`	`// add mapping without starting local listeners`
`59`	`59`	`for _, v := range cfg.Proxy.ExternalServers {`
`60`		`- if _, ok := brokerToListenerAddresses[v.BrokerAddress]; ok {`
`61`		`- return nil, fmt.Errorf("broker to listener address mapping %s configured twice", v.BrokerAddress)`
	`60`	`+ if la, ok := brokerToListenerAddresses[v.BrokerAddress]; ok {`
	`61`	`+ if la != v.ListenerAddress {`
	`62`	`+ return nil, fmt.Errorf("broker to listener address mapping %s configured twice: %s and %s", v.BrokerAddress, v.ListenerAddress, la)`
	`63`	`+ }`
	`64`	`+ continue`
`62`	`65`	`}`
`63`	`66`	`brokerToListenerAddresses[v.BrokerAddress] = v.ListenerAddress`
`64`	`67`	`}`