acbcad7b4e
* reload: use OnRestart
Close the listener on OnRestart for health and metrics so the default
setup function can setup the listener when the plugin is "starting up".
Lightly test with some SIGUSR1-ing. Also checked the reload plugin with
this, seems fine:
.com.:1043
.:1043
2018/04/20 15:01:25 [INFO] CoreDNS-1.1.1
2018/04/20 15:01:25 [INFO] linux/amd64, go1.10,
CoreDNS-1.1.1
linux/amd64, go1.10,
2018/04/20 15:01:25 [INFO] Running configuration MD5 = aa8b3f03946fb60546ca1f725d482714
2018/04/20 15:02:01 [INFO] Reloading
2018/04/20 15:02:01 [INFO] Running configuration MD5 = b34a96d99e01db4015a892212560155f
2018/04/20 15:02:01 [INFO] Reloading complete
^C2018/04/20 15:02:06 [INFO] SIGINT: Shutting down
With this corefile:
.com {
proxy . 127.0.0.1:53
prometheus :9054
whoami
reload
}
. {
proxy . 127.0.0.1:53
prometheus :9054
whoami
reload
}
The prometheus port was 9053, changed that to 54 so reload would pick it
up.
From a cursory look it seems this also fixes:
Fixes #1604 #1618 #1686 #1492
* At least make it test
* Use onfinalshutdown
* reload: add reload test
This test #1604 adn right now fails.
* Address review comments
* Add bug section explaining things a bit
* compile tests
* Fix tests
* fixes
* slightly less crazy
* try to make prometheus setup less confusing
* Use ephermal port for test
* Don't use the listener
* These are shared between goroutines, just use the boolean in the main
structure.
* Fix text in the reload README,
* Set addr to TODO once stopping it
* Morph fturb's comment into test, to test reload and scrape health and
metric endpoint
52 lines
906 B
Go
52 lines
906 B
Go
package metrics
|
|
|
|
// addrs keeps track on which addrs we listen, so we only start one listener, is
|
|
// prometheus is used in multiple Server Blocks.
|
|
type addrs struct {
|
|
a map[string]value
|
|
}
|
|
|
|
type value struct {
|
|
state int
|
|
f func() error
|
|
}
|
|
|
|
var uniqAddr addrs
|
|
|
|
func newAddress() addrs {
|
|
return addrs{a: make(map[string]value)}
|
|
}
|
|
|
|
func (a addrs) setAddress(addr string, f func() error) {
|
|
if a.a[addr].state == done {
|
|
return
|
|
}
|
|
a.a[addr] = value{todo, f}
|
|
}
|
|
|
|
// setAddressTodo sets addr to 'todo' again.
|
|
func (a addrs) setAddressTodo(addr string) {
|
|
v, ok := a.a[addr]
|
|
if !ok {
|
|
return
|
|
}
|
|
v.state = todo
|
|
a.a[addr] = v
|
|
}
|
|
|
|
// forEachTodo iterates for a and executes f for each element that is 'todo' and sets it to 'done'.
|
|
func (a addrs) forEachTodo() error {
|
|
for k, v := range a.a {
|
|
if v.state == todo {
|
|
v.f()
|
|
}
|
|
v.state = done
|
|
a.a[k] = v
|
|
}
|
|
return nil
|
|
}
|
|
|
|
const (
|
|
todo = 1
|
|
done = 2
|
|
)
|