aboutsummaryrefslogtreecommitdiff
path: root/plugin/proxy/google.go
diff options
context:
space:
mode:
Diffstat (limited to 'plugin/proxy/google.go')
-rw-r--r--plugin/proxy/google.go25
1 files changed, 1 insertions, 24 deletions
diff --git a/plugin/proxy/google.go b/plugin/proxy/google.go
index ecc5e6dfd..d7248e149 100644
--- a/plugin/proxy/google.go
+++ b/plugin/proxy/google.go
@@ -10,7 +10,6 @@ import (
"net"
"net/http"
"net/url"
- "sync/atomic"
"time"
"github.com/coredns/coredns/plugin/pkg/healthcheck"
@@ -198,7 +197,6 @@ func newUpstream(hosts []string, old *staticUpstream) Upstream {
Future: 60 * time.Second,
},
ex: old.ex,
- WithoutPathPrefix: old.WithoutPathPrefix,
IgnoredSubDomains: old.IgnoredSubDomains,
}
@@ -209,28 +207,7 @@ func newUpstream(hosts []string, old *staticUpstream) Upstream {
Conns: 0,
Fails: 0,
FailTimeout: upstream.FailTimeout,
-
- CheckDown: func(upstream *staticUpstream) healthcheck.UpstreamHostDownFunc {
- return func(uh *healthcheck.UpstreamHost) bool {
-
- down := false
-
- uh.CheckMu.Lock()
- until := uh.OkUntil
- uh.CheckMu.Unlock()
-
- if !until.IsZero() && time.Now().After(until) {
- down = true
- }
-
- fails := atomic.LoadInt32(&uh.Fails)
- if fails >= upstream.MaxFails && upstream.MaxFails != 0 {
- down = true
- }
- return down
- }
- }(upstream),
- WithoutPathPrefix: upstream.WithoutPathPrefix,
+ CheckDown: checkDownFunc(upstream),
}
upstream.Hosts[i] = uh