Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-25 08:09:43 +02:00
Code Releases Activity

wrap errors up, log at top level only

Browse source
This commit is contained in:
Harvey Kandola 2017-08-03 10:00:24 +01:00
parent ecc94f31c9
commit 476403bf46
28 changed files with 899 additions and 804 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/convapi/response.go
View file

@ -13,7 +13,6 @@ package convapi
import (
"encoding/json"
"github.com/documize/community/core/log"
"net/http"
)
@ -33,7 +32,6 @@ func SetJSONResponse(w http.ResponseWriter) {
// WriteError to the http.ResponseWriter, taking care to provide the correct
// response error code within the JSON response.
func WriteError(w http.ResponseWriter, err error) {
response := apiJSONResponse{}
response.Message = err.Error()
response.Success = false
@ -57,20 +55,13 @@ func WriteError(w http.ResponseWriter, err error) {
w.WriteHeader(http.StatusInternalServerError)
}
json, err := json.Marshal(response)
if err != nil {
log.Error("json.Marshal", err)
}
if _, err := w.Write(json); err != nil {
log.Error("write to ResponseWriter", err)
}
json, _ := json.Marshal(response)
w.Write(json)
}
// WriteErrorBadRequest provides feedback to a Documize client on an error,
// where that error is described in a string.
func WriteErrorBadRequest(w http.ResponseWriter, message string) {
response := apiJSONResponse{}
response.Message = message
response.Success = false
@ -79,12 +70,7 @@ func WriteErrorBadRequest(w http.ResponseWriter, message string) {
response.Code = 400
w.WriteHeader(http.StatusBadRequest)
json, err := json.Marshal(response)
if err != nil {
log.Error("json.Marshal", err)
}
json, _ := json.Marshal(response)
if _, err := w.Write(json); err != nil {
log.Error("write to ResponseWriter", err)
}
w.Write(json)
}