diff options
| author |  Miek Gieben <miek@miek.nl>
| 2019-03-25 17:46:44 +0000 |
|---|---|---|
| committer |  Yong Tang <yong.tang.github@outlook.com>
| 2019-03-25 10:46:44 -0700 |
| commit | 9a8c301a42433ed9bd2479ef7ab13e1d6d6e7627 (patch) | |
| tree | b2cb172f276e8a8dab4003dfe8edcc14f9e4cbd8 /plugin/metrics/context.go | |
| parent | 45624a0c0a93833bc136f20f316f78dd16462e82 (diff) | |
| download | coredns-9a8c301a42433ed9bd2479ef7ab13e1d6d6e7627.tar.gz coredns-9a8c301a42433ed9bd2479ef7ab13e1d6d6e7627.tar.zst coredns-9a8c301a42433ed9bd2479ef7ab13e1d6d6e7627.zip | |
Remove server addr from the context (#2722)
* more
Signed-off-by: Miek Gieben <miek@miek.nl>
* Remove server addr from the context
This was added twice, just leave the server which also holds the
address.
Conflicts with #2719 but should be easy to fix.
Signed-off-by: Miek Gieben <miek@miek.nl>
* doesn't need server context
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin/metrics/context.go')
| -rw-r--r-- | plugin/metrics/context.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/plugin/metrics/context.go b/plugin/metrics/context.go index 7ee25ef4a..da6bdb12d 100644 --- a/plugin/metrics/context.go +++ b/plugin/metrics/context.go @@ -3,7 +3,7 @@ package metrics import ( "context" - "github.com/coredns/coredns/plugin/metrics/vars" + "github.com/coredns/coredns/core/dnsserver" ) // WithServer returns the current server handling the request. It returns the @@ -15,4 +15,10 @@ import ( // Basic usage with a metric: // // <metric>.WithLabelValues(metrics.WithServer(ctx), labels..).Add(1) -func WithServer(ctx context.Context) string { return vars.WithServer(ctx) } +func WithServer(ctx context.Context) string { + srv := ctx.Value(dnsserver.Key{}) + if srv == nil { + return "" + } + return srv.(*dnsserver.Server).Addr +} |