diff options
Diffstat (limited to 'middleware/proxy')
| -rw-r--r-- | middleware/proxy/google.go | 42 | ||||
| -rw-r--r-- | middleware/proxy/upstream.go | 8 |
2 files changed, 27 insertions, 23 deletions
diff --git a/middleware/proxy/google.go b/middleware/proxy/google.go index b2a3b45f8..5efb84960 100644 --- a/middleware/proxy/google.go +++ b/middleware/proxy/google.go @@ -126,13 +126,7 @@ func (g *google) OnStartup(p *Proxy) error { new, err := g.bootstrapProxy.Lookup(state, g.endpoint, dns.TypeA) - oldUpstream := *p.Upstreams - oldFrom := "" - var oldEx Exchanger - if len(oldUpstream) > 0 { - oldFrom = oldUpstream[0].From() - oldEx = oldUpstream[0].Exchanger() - } + var oldUpstream Upstream // ignore errors here, as we want to keep on trying. if err != nil { @@ -143,8 +137,13 @@ func (g *google) OnStartup(p *Proxy) error { log.Printf("[WARNING] Failed to bootstrap A records %q: %s", g.endpoint, err) } - up := newUpstream(addrs, oldFrom, oldEx) - p.Upstreams = &[]Upstream{up} + if len(*p.Upstreams) > 0 { + oldUpstream = (*p.Upstreams)[0] + up := newUpstream(addrs, oldUpstream.(*staticUpstream)) + p.Upstreams = &[]Upstream{up} + } else { + log.Printf("[WARNING] Failed to bootstrap upstreams %q", g.endpoint) + } } go func() { @@ -164,8 +163,11 @@ func (g *google) OnStartup(p *Proxy) error { continue } - up := newUpstream(addrs, oldFrom, oldEx) - p.Upstreams = &[]Upstream{up} + // TODO(miek): can this actually happen? + if oldUpstream != nil { + up := newUpstream(addrs, oldUpstream.(*staticUpstream)) + p.Upstreams = &[]Upstream{up} + } } case <-g.quit: @@ -195,15 +197,17 @@ func extractAnswer(m *dns.Msg) ([]string, error) { } // newUpstream returns an upstream initialized with hosts. -func newUpstream(hosts []string, from string, ex Exchanger) Upstream { +func newUpstream(hosts []string, old *staticUpstream) Upstream { upstream := &staticUpstream{ - from: from, - Hosts: nil, - Policy: &Random{}, - Spray: nil, - FailTimeout: 10 * time.Second, - MaxFails: 3, - ex: ex, + from: old.from, + Hosts: nil, + Policy: &Random{}, + Spray: nil, + FailTimeout: 10 * time.Second, + MaxFails: 3, + ex: old.ex, + WithoutPathPrefix: old.WithoutPathPrefix, + IgnoredSubDomains: old.IgnoredSubDomains, } upstream.Hosts = make([]*UpstreamHost, len(hosts)) diff --git a/middleware/proxy/upstream.go b/middleware/proxy/upstream.go index ce3c085f6..b269544e2 100644 --- a/middleware/proxy/upstream.go +++ b/middleware/proxy/upstream.go @@ -281,11 +281,11 @@ func (u *staticUpstream) Select() *UpstreamHost { } func (u *staticUpstream) IsAllowedDomain(name string) bool { - for _, ignoredSubDomain := range u.IgnoredSubDomains { - if dns.Name(name) == dns.Name(u.From()) { - return true - } + if dns.Name(name) == dns.Name(u.From()) { + return true + } + for _, ignoredSubDomain := range u.IgnoredSubDomains { if middleware.Name(ignoredSubDomain).Matches(name) { return false } |