Skip to content
Snippets Groups Projects
Commit bdc8acf0 authored by Mikhail Karnevskiy's avatar Mikhail Karnevskiy
Browse files

switch back to detailed default true

parent 6222a480
Branches
Tags
No related merge requests found
......@@ -53,7 +53,7 @@ var testsGetCommand = []struct {
expectedGroupID + "/next", "&resend_nacks=true&delay_ms=10000&resend_attempts=3", "{\"id_key\":\"_id\",\"resend\":true,\"delay_ms\":10000,\"resend_attempts\":3}"},
{"size", expectedSource, expectedStream, "", expectedStream + "/size", "", ""},
{"size", expectedSource, expectedStream, "", expectedStream + "/size", "&incomplete=true", "true"},
{"streams", expectedSource, "0", "", "0/streams", "", "{\"from\":\"\",\"filter\":\"all\",\"detailed\":false,\"last\":false,\"single\":false}"},
{"streams", expectedSource, "0", "", "0/streams", "", "{\"from\":\"\",\"filter\":\"all\",\"detailed\":true,\"last\":false,\"single\":false}"},
{"lastack", expectedSource, expectedStream, expectedGroupID, expectedStream + "/" + expectedGroupID + "/lastack", "", ""},
{"datasources", expectedSource, "0", "", "0/sources", "", ""},
}
......
......@@ -10,12 +10,14 @@ import (
type GetStreamsParams = database.GetStreamsParams
func getBoolKey(vals url.Values, key string) (bool, bool) {
func getBoolKey(vals url.Values, key string, defaultVal bool) (bool, bool) {
val_str := vals.Get(key)
if val_str == "true" {
return true, true
} else if val_str == "false" || val_str == "" {
} else if val_str == "false" {
return false, true
} else if val_str == "" {
return defaultVal, true
} else {
return false, false
}
......@@ -37,17 +39,17 @@ func getFilterKey(vals url.Values) (string, bool) {
func routeGetStreams(w http.ResponseWriter, r *http.Request) {
keys := r.URL.Query()
detailed, ok := getBoolKey(keys, "detailed")
detailed, ok := getBoolKey(keys, "detailed", true)
if !ok {
w.WriteHeader(http.StatusBadRequest)
return
}
last, ok := getBoolKey(keys, "last")
last, ok := getBoolKey(keys, "last", false)
if !ok {
w.WriteHeader(http.StatusBadRequest)
return
}
single, ok := getBoolKey(keys, "single")
single, ok := getBoolKey(keys, "single", false)
if !ok {
w.WriteHeader(http.StatusBadRequest)
return
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment