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 #865 from robstrong/hotfix/contentType

Browse Source 
fix(peer_server) set content type to application/json in admin
This commit is contained in:
Yicheng Qin
2014-06-23 16:31:49 -07:00
parent 3efb4d837b 494d2c67aa
commit 5524131a9e
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/peer_server_handlers.go
View File

@@ -188,6 +188,7 @@ func (ps *PeerServer) RemoveHttpHandler(w http.ResponseWriter, req *http.Request
// Returns a JSON-encoded cluster configuration. // Returns a JSON-encoded cluster configuration.
func (ps *PeerServer) getClusterConfigHttpHandler(w http.ResponseWriter, req *http.Request) { func (ps *PeerServer) getClusterConfigHttpHandler(w http.ResponseWriter, req *http.Request) {
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(ps.ClusterConfig()) json.NewEncoder(w).Encode(ps.ClusterConfig())
} }
@@ -217,6 +218,7 @@ func (ps *PeerServer) setClusterConfigHttpHandler(w http.ResponseWriter, req *ht
log.Debugf("[recv] Update Cluster Config Request") log.Debugf("[recv] Update Cluster Config Request")
ps.server.Dispatch(c, w, req) ps.server.Dispatch(c, w, req)
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(ps.ClusterConfig()) json.NewEncoder(w).Encode(ps.ClusterConfig())
} }
@@ -230,6 +232,7 @@ func (ps *PeerServer) getMachinesHttpHandler(w http.ResponseWriter, req *http.Re
} }
} }
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(&machines) json.NewEncoder(w).Encode(&machines)
} }
@@ -237,6 +240,7 @@ func (ps *PeerServer) getMachinesHttpHandler(w http.ResponseWriter, req *http.Re
func (ps *PeerServer) getMachineHttpHandler(w http.ResponseWriter, req *http.Request) { func (ps *PeerServer) getMachineHttpHandler(w http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req) vars := mux.Vars(req)
m := ps.getMachineMessage(vars["name"], ps.raftServer.Leader()) m := ps.getMachineMessage(vars["name"], ps.raftServer.Leader())
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(m) json.NewEncoder(w).Encode(m)
} }

4
tests/functional/cluster_config_test.go
View File

@@ -25,6 +25,7 @@ func TestClusterConfigSet(t *testing.T) {
resp, _ = tests.Get("http://localhost:7002/v2/admin/config") resp, _ = tests.Get("http://localhost:7002/v2/admin/config")
body := tests.ReadBodyJSON(resp) body := tests.ReadBodyJSON(resp)
assert.Equal(t, resp.StatusCode, 200) assert.Equal(t, resp.StatusCode, 200)
assert.Equal(t, resp.Header.Get("Content-Type"), "application/json")
assert.Equal(t, body["activeSize"], 3) assert.Equal(t, body["activeSize"], 3)
assert.Equal(t, body["removeDelay"], 60) assert.Equal(t, body["removeDelay"], 60)
} }
@@ -44,6 +45,7 @@ func TestClusterConfigReload(t *testing.T) {
resp, _ = tests.Get("http://localhost:7002/v2/admin/config") resp, _ = tests.Get("http://localhost:7002/v2/admin/config")
body := tests.ReadBodyJSON(resp) body := tests.ReadBodyJSON(resp)
assert.Equal(t, resp.StatusCode, 200) assert.Equal(t, resp.StatusCode, 200)
assert.Equal(t, resp.Header.Get("Content-Type"), "application/json")
assert.Equal(t, body["activeSize"], 3) assert.Equal(t, body["activeSize"], 3)
assert.Equal(t, body["removeDelay"], 60) assert.Equal(t, body["removeDelay"], 60)
@@ -59,6 +61,7 @@ func TestClusterConfigReload(t *testing.T) {
resp, _ = tests.Get("http://localhost:7002/v2/admin/config") resp, _ = tests.Get("http://localhost:7002/v2/admin/config")
body = tests.ReadBodyJSON(resp) body = tests.ReadBodyJSON(resp)
assert.Equal(t, resp.StatusCode, 200) assert.Equal(t, resp.StatusCode, 200)
assert.Equal(t, resp.Header.Get("Content-Type"), "application/json")
assert.Equal(t, body["activeSize"], 3) assert.Equal(t, body["activeSize"], 3)
assert.Equal(t, body["removeDelay"], 60) assert.Equal(t, body["removeDelay"], 60)
} }
@@ -76,6 +79,7 @@ func TestGetMachines(t *testing.T) {
t.FailNow() t.FailNow()
} }
assert.Equal(t, resp.StatusCode, 200) assert.Equal(t, resp.StatusCode, 200)
assert.Equal(t, resp.Header.Get("Content-Type"), "application/json")
machines := make([]map[string]interface{}, 0) machines := make([]map[string]interface{}, 0)
b := tests.ReadBody(resp) b := tests.ReadBody(resp)
json.Unmarshal(b, &machines) json.Unmarshal(b, &machines)