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

Merge pull request #4283 from heyitsanthony/fix-stopdelay-leak

Browse Source 
etcdserver: complete stopWithDelay on server shutdown
This commit is contained in:
Anthony Romano 2016-01-25 20:11:55 -08:00
commit 2a9cccd659
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etcdserver/server.go
View File

@ -704,7 +704,10 @@ func (s *EtcdServer) Stop() {
} }
func (s *EtcdServer) stopWithDelay(d time.Duration, err error) { func (s *EtcdServer) stopWithDelay(d time.Duration, err error) {
time.Sleep(d) select {
case <-time.After(d):
case <-s.done:
}
select { select {
case s.errorc <- err: case s.errorc <- err:
default: default: