diff options
| author |  Miek Gieben <miek@miek.nl>
| 2017-01-15 08:12:58 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-01-15 08:12:58 +0000 |
| commit | 52e01264e8a5901209f83335aa96e091c93ced7e (patch) | |
| tree | 433625011d8ce8f041147ec4ef171d55678be2be /middleware/etcd/setup.go | |
| parent | a6d232a622a2f83a5d5ea1d9d946da7f910a0f9e (diff) | |
| download | coredns-52e01264e8a5901209f83335aa96e091c93ced7e.tar.gz coredns-52e01264e8a5901209f83335aa96e091c93ced7e.tar.zst coredns-52e01264e8a5901209f83335aa96e091c93ced7e.zip | |
middleware/proxy: implement Exchanger (#480)
By defining and using an proxy.Exchanger interface we make the proxy
more generic and we can then fold back httproxy into proxy.
This overrides #463 and #473 and should make futures extensions rather
trivial
* Add docs that talk about `protocol` and how to set it.
* middleware/proxy: rename New to NewLookup
It's used as a Lookup mechanism not as a completely new proxy,
reflect that in the name.
* Set maxfails to 3 by default when looking up names.
Most of the changes have been copied
from https://github.com/johnbelamaric/coredns/pull/1/files
Diffstat (limited to 'middleware/etcd/setup.go')
| -rw-r--r-- | middleware/etcd/setup.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/middleware/etcd/setup.go b/middleware/etcd/setup.go index 081d17347..065b3e884 100644 --- a/middleware/etcd/setup.go +++ b/middleware/etcd/setup.go @@ -49,7 +49,7 @@ func setup(c *caddy.Controller) error { func etcdParse(c *caddy.Controller) (*Etcd, bool, error) { stub := make(map[string]proxy.Proxy) etc := Etcd{ - Proxy: proxy.New([]string{"8.8.8.8:53", "8.8.4.4:53"}), + Proxy: proxy.NewLookup([]string{"8.8.8.8:53", "8.8.4.4:53"}), PathPrefix: "skydns", Ctx: context.Background(), Inflight: &singleflight.Group{}, @@ -57,7 +57,7 @@ func etcdParse(c *caddy.Controller) (*Etcd, bool, error) { } var ( tlsConfig *tls.Config - err error + err error endpoints = []string{defaultEndpoint} stubzones = false ) @@ -96,7 +96,7 @@ func etcdParse(c *caddy.Controller) (*Etcd, bool, error) { if err != nil { return &Etcd{}, false, err } - etc.Proxy = proxy.New(ups) + etc.Proxy = proxy.NewLookup(ups) case "tls": // cert key cacertfile args := c.RemainingArgs() tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...) @@ -134,7 +134,7 @@ func etcdParse(c *caddy.Controller) (*Etcd, bool, error) { if err != nil { return &Etcd{}, false, c.ArgErr() } - etc.Proxy = proxy.New(ups) + etc.Proxy = proxy.NewLookup(ups) case "tls": // cert key cacertfile args := c.RemainingArgs() tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...) |