Merge pull request #2518 from hashicorp/f-pretty

Defaults to pretty JSON in dev mode.
hashicorp · Nov 18, 2016 · 761833c · 761833c
2 parents bb54e74 + fa680bd
commit 761833c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/command/agent/http.go b/command/agent/http.go
@@ -393,7 +393,7 @@ func (s *HTTPServer) wrap(handler func(resp http.ResponseWriter, req *http.Reque
 // marshalJSON marshals the object into JSON, respecting the user's pretty-ness
 // configuration.
 func (s *HTTPServer) marshalJSON(req *http.Request, obj interface{}) ([]byte, error) {
-	if _, ok := req.URL.Query()["pretty"]; ok {
+	if _, ok := req.URL.Query()["pretty"]; ok || s.agent.config.DevMode {
 		buf, err := json.MarshalIndent(obj, "", "    ")
 		if err != nil {
 			return nil, err