octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 23:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/syncthing: Return formatted JSON in API (#4945)

Browse Source 
Because machines don't care, and sometimes humans read the output.
This commit is contained in:
Jakob Borg 2018-05-12 15:14:41 +02:00 committed by GitHub
parent 9e696a154b
commit 0c81fa4191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/syncthing/gui.go
View File

@ -219,14 +219,14 @@ func sendJSON(w http.ResponseWriter, jsonObject interface{}) {
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")
// Marshalling might fail, in which case we should return a 500 with the // Marshalling might fail, in which case we should return a 500 with the
// actual error. // actual error.
bs, err := json.Marshal(jsonObject) bs, err := json.MarshalIndent(jsonObject, "", " ")
if err != nil { if err != nil {
// This Marshal() can't fail though. // This Marshal() can't fail though.
bs, _ = json.Marshal(map[string]string{"error": err.Error()}) bs, _ = json.Marshal(map[string]string{"error": err.Error()})
http.Error(w, string(bs), http.StatusInternalServerError) http.Error(w, string(bs), http.StatusInternalServerError)
return return
} }
w.Write(bs) fmt.Fprintf(w, "%s\n", bs)
} }
func (s *apiService) Serve() { func (s *apiService) Serve() {