Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: Move director interrupt handler to method

Browse Source
This commit is contained in:
Christian Provenzano 2022-05-11 20:41:10 -04:00
parent 655d171eca
commit b5b466088d
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/proxy/httpproxy/director.go
View File

@ -45,9 +45,7 @@ func newDirector(lg *zap.Logger, urlsFunc GetProxyURLs, failureWait time.Duratio
stopc: make(chan struct{}),
donec: make(chan struct{}),
}
osutil.RegisterInterruptHandler(func() {
close(d.stopc)
})
osutil.RegisterInterruptHandler(d.stop)
d.refresh()
go func() {
defer close(d.donec)
@ -129,6 +127,15 @@ func (d *director) endpoints() []*endpoint {
return filtered
}
func (d *director) stop() {
close(d.stopc)
select {
case <-d.donec:
case <-time.After(time.Second):
d.lg.Warn("timed out waiting for director to stop")
}
}
func newEndpoint(lg *zap.Logger, u url.URL, failureWait time.Duration) *endpoint {
ep := endpoint{
lg: lg,

7
server/proxy/httpproxy/director_test.go
View File

@ -67,12 +67,7 @@ func TestNewDirectorScheme(t *testing.T) {
t.Errorf("#%d: want endpoints = %#v, got = %#v", i, tt.want, gep)
}
close(got.stopc)
select {
case <-got.donec:
case <-time.After(time.Second):
t.Fatalf("done took too long")
}
got.stop()
}
}