luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent: Key list of root returns empty list with 200 instead of 404

This commit is contained in:
Armon Dadgar 2014-04-30 14:21:02 -07:00 committed by Jack Pearkes
parent ee1eefc997
commit cd08e81958
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
command/agent/kvs_endpoint.go
View File

@ -95,11 +95,17 @@ func (s *HTTPServer) KVSGetKeys(resp http.ResponseWriter, req *http.Request, arg
} }
setMeta(resp, &out.QueryMeta) setMeta(resp, &out.QueryMeta)
// Check if we get a not found // Check if we get a not found. We do not generate
if len(out.Keys) == 0 { // not found for the root, but just provide the empty list
if len(out.Keys) == 0 && listArgs.Prefix != "" {
resp.WriteHeader(404) resp.WriteHeader(404)
return nil, nil return nil, nil
} }
// Use empty list instead of null
if out.Keys == nil {
out.Keys = []string{}
}
return out.Keys, nil return out.Keys, nil
} }