From 3d32c059dd1d34d5fdd5649cfeb279669749f411 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Fri, 3 Apr 2015 13:41:35 -0700 Subject: [PATCH] raft: generate correct json-format status Current json-format string misses the double quote around status field. Use %q for better clearance. --- raft/status.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/raft/status.go b/raft/status.go index 3e66ea3ea..fca7fedb8 100644 --- a/raft/status.go +++ b/raft/status.go @@ -50,14 +50,14 @@ func getStatus(r *raft) Status { // TODO: try to simplify this by introducing ID type into raft func (s Status) MarshalJSON() ([]byte, error) { - j := fmt.Sprintf(`{"id":"%x","term":%d,"vote":"%x","commit":%d,"lead":"%x","raftState":"%s","progress":{`, + j := fmt.Sprintf(`{"id":"%x","term":%d,"vote":"%x","commit":%d,"lead":"%x","raftState":%q,"progress":{`, s.ID, s.Term, s.Vote, s.Commit, s.Lead, s.RaftState) if len(s.Progress) == 0 { j += "}}" } else { for k, v := range s.Progress { - subj := fmt.Sprintf(`"%x":{"match":%d,"next":%d,"state":%s},`, k, v.Match, v.Next, v.State) + subj := fmt.Sprintf(`"%x":{"match":%d,"next":%d,"state":%q},`, k, v.Match, v.Next, v.State) j += subj } // remove the trailing ","