Only adding default fronted server if no fronted and no chained servers present

oxtoacart · oxtoacart · commit 2b2e3707f771 · 2014-12-29T07:31:11.000-06:00
diff --git a/src/github.com/getlantern/flashlight/config/config.go b/src/github.com/getlantern/flashlight/config/config.go
@@ -211,7 +211,7 @@ func (cfg *Config) applyClientDefaults() {
 	if cfg.Client.FrontedServers == nil {
 		cfg.Client.FrontedServers = make([]*client.FrontedServerInfo, 0)
 	}
-	if len(cfg.Client.FrontedServers) == 0 {
+	if len(cfg.Client.FrontedServers) == 0 && len(cfg.Client.ChainedServers) == 0 {
 		cfg.Client.FrontedServers = append(cfg.Client.FrontedServers, &client.FrontedServerInfo{
 			Host:          "roundrobin.getiantem.org",
 			Port:          443,

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func (cfg *Config) applyClientDefaults() {`
`211`	`211`	`if cfg.Client.FrontedServers == nil {`
`212`	`212`	`cfg.Client.FrontedServers = make([]*client.FrontedServerInfo, 0)`
`213`	`213`	`}`
`214`		`- if len(cfg.Client.FrontedServers) == 0 {`
	`214`	`+ if len(cfg.Client.FrontedServers) == 0 && len(cfg.Client.ChainedServers) == 0 {`
`215`	`215`	`cfg.Client.FrontedServers = append(cfg.Client.FrontedServers, &client.FrontedServerInfo{`
`216`	`216`	`Host: "roundrobin.getiantem.org",`
`217`	`217`	`Port: 443,`