aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--go/weed/weed_server/common.go1
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 46f3c0430..ab4f54fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
weed
+tags
+*.swp
diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go
index 3968f3191..44ffcce47 100644
--- a/go/weed/weed_server/common.go
+++ b/go/weed/weed_server/common.go
@@ -65,7 +65,6 @@ func writeJsonQuiet(w http.ResponseWriter, r *http.Request, httpStatus int, obj
}
}
func writeJsonError(w http.ResponseWriter, r *http.Request, httpStatus int, err error) {
- w.WriteHeader(http.StatusInternalServerError)
m := make(map[string]interface{})
m["error"] = err.Error()
writeJsonQuiet(w, r, httpStatus, m)