diff options
| author |  Francois Tur <ftur@infoblox.com>
| 2018-09-19 05:11:24 -0400 |
|---|---|---|
| committer |  Yong Tang <yong.tang.github@outlook.com>
| 2018-09-19 02:11:24 -0700 |
| commit | f9bdd382ddf911c88b33d2bbd8f8aa9be2885a39 (patch) | |
| tree | 13a8d3829b2c3560938619df65985fa33c966f41 /plugin/cache | |
| parent | cb932ca23103485d67e447eeddd855007015d30e (diff) | |
| download | coredns-f9bdd382ddf911c88b33d2bbd8f8aa9be2885a39.tar.gz coredns-f9bdd382ddf911c88b33d2bbd8f8aa9be2885a39.tar.zst coredns-f9bdd382ddf911c88b33d2bbd8f8aa9be2885a39.zip | |
Ensure Re-register of metrics variables after a reload (#2080)
* - ensure plugins that use prometheus.MustRegister, re-register after reload
- removing once.Do on the startup function was simplest way to do it.
* - fix underscored names (advice of bot)
* - tune existing UT for reload, and add a test verifying failing reload does not prevent correct registering for metrics
* - ensure different ports for tests that can run in same time ..
Diffstat (limited to 'plugin/cache')
| -rw-r--r-- | plugin/cache/handler.go | 3 | ||||
| -rw-r--r-- | plugin/cache/setup.go | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/plugin/cache/handler.go b/plugin/cache/handler.go index a44a4ec3b..2d608e8d3 100644 --- a/plugin/cache/handler.go +++ b/plugin/cache/handler.go @@ -3,7 +3,6 @@ package cache import ( "context" "math" - "sync" "time" "github.com/coredns/coredns/plugin" @@ -126,5 +125,3 @@ var ( Help: "The number responses that are not cached, because the reply is malformed.", }, []string{"server"}) ) - -var once sync.Once diff --git a/plugin/cache/setup.go b/plugin/cache/setup.go index 8464c27d9..d6052b162 100644 --- a/plugin/cache/setup.go +++ b/plugin/cache/setup.go @@ -34,11 +34,9 @@ func setup(c *caddy.Controller) error { }) c.OnStartup(func() error { - once.Do(func() { - metrics.MustRegister(c, - cacheSize, cacheHits, cacheMisses, - cachePrefetches, cacheDrops) - }) + metrics.MustRegister(c, + cacheSize, cacheHits, cacheMisses, + cachePrefetches, cacheDrops) return nil }) |