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 #5062 from gyuho/govet-mutex

Browse Source 
etcd-tester: fix govet
This commit is contained in:
Gyu-Ho Lee 2016-04-13 11:19:20 -07:00
commit 15e865e024
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/functional-tester/etcd-tester/http.go
View File

@ -26,8 +26,19 @@ type statusHandler struct {
func (sh statusHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (sh statusHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
en := json.NewEncoder(w) en := json.NewEncoder(w)
err := en.Encode(sh.status.get())
if err != nil { sh.status.mu.Lock()
defer sh.status.mu.Unlock()
if err := en.Encode(Status{
Since: sh.status.Since,
Failures: sh.status.Failures,
RoundLimit: sh.status.RoundLimit,
Cluster: sh.status.cluster.Status(),
cluster: sh.status.cluster,
Round: sh.status.Round,
Case: sh.status.Case,
}); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
} }
} }

10
tools/functional-tester/etcd-tester/tester.go
View File

@ -208,16 +208,6 @@ type Status struct {
Case int Case int
} }
// get gets a copy of status
func (s *Status) get() Status {
s.mu.Lock()
got := *s
cluster := s.cluster
s.mu.Unlock()
got.Cluster = cluster.Status()
return got
}
func (s *Status) setRound(r int) { func (s *Status) setRound(r int) {
s.mu.Lock() s.mu.Lock()
defer s.mu.Unlock() defer s.mu.Unlock()