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

etcd: we should trust people

Browse Source
This commit is contained in:
Xiang Li 2014-08-08 18:52:10 -07:00 committed by Yicheng Qin
parent 55c4a3307d
commit 3af8c7da3c
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etcd/etcd.go
View File

@ -115,9 +115,6 @@ func (s *Server) SetTick(tick time.Duration) {
// Stop stops the server elegently. // Stop stops the server elegently.
func (s *Server) Stop() { func (s *Server) Stop() {
if s.mode.Get() == stopMode {
return
}
s.mu.Lock() s.mu.Lock()
s.stopped = true s.stopped = true
switch s.mode.Get() { switch s.mode.Get() {

2
etcd/etcd_start_test.go
View File

@ -190,7 +190,7 @@ func buildServer(t *testing.T, c *config.Config, id int64) (e *Server, h *httpte
break break
} }
if err != nil { if err != nil {
destroyServer(t, e, h) h.Close()
return nil, nil, err return nil, nil, err
} }
time.Sleep(10 * time.Millisecond) time.Sleep(10 * time.Millisecond)