RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-16 18:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix API response codes

Browse Source
This commit is contained in:
Fabian Reinartz 2015-12-07 13:41:18 +01:00
parent 7ddcc42efa
commit f286930c69
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
api.go
View File

@ -92,8 +92,7 @@ type errorType string
const ( const (
errorNone errorType = "" errorNone errorType = ""
errorTimeout = "timeout" errorInternal = "server_error"
errorCanceled = "canceled"
errorBadData = "bad_data" errorBadData = "bad_data"
) )
@ -146,7 +145,7 @@ func (api *API) listAlerts(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
respondError(w, apiError{ respondError(w, apiError{
typ: errorBadData, typ: errorInternal,
err: err, err: err,
}, nil) }, nil)
return return
@ -202,7 +201,7 @@ func (api *API) legacyAddAlerts(w http.ResponseWriter, r *http.Request) {
// TODO(fabxc): validate input. // TODO(fabxc): validate input.
if err := api.alerts.Put(alerts...); err != nil { if err := api.alerts.Put(alerts...); err != nil {
respondError(w, apiError{ respondError(w, apiError{
typ: errorBadData, typ: errorInternal,
err: err, err: err,
}, nil) }, nil)
return return
@ -235,7 +234,7 @@ func (api *API) addAlerts(w http.ResponseWriter, r *http.Request) {
// TODO(fabxc): validate input. // TODO(fabxc): validate input.
if err := api.alerts.Put(alerts...); err != nil { if err := api.alerts.Put(alerts...); err != nil {
respondError(w, apiError{ respondError(w, apiError{
typ: errorBadData, typ: errorInternal,
err: err, err: err,
}, nil) }, nil)
return return
@ -259,7 +258,7 @@ func (api *API) addSilence(w http.ResponseWriter, r *http.Request) {
sid, err := api.silences.Set(&sil) sid, err := api.silences.Set(&sil)
if err != nil { if err != nil {
respondError(w, apiError{ respondError(w, apiError{
typ: errorBadData, typ: errorInternal,
err: err, err: err,
}, nil) }, nil)
return return
@ -303,7 +302,7 @@ func (api *API) delSilence(w http.ResponseWriter, r *http.Request) {
if err := api.silences.Del(sid); err != nil { if err := api.silences.Del(sid); err != nil {
respondError(w, apiError{ respondError(w, apiError{
typ: errorBadData, typ: errorInternal,
err: err, err: err,
}, nil) }, nil)
return return
@ -315,7 +314,7 @@ func (api *API) listSilences(w http.ResponseWriter, r *http.Request) {
sils, err := api.silences.All() sils, err := api.silences.All()
if err != nil { if err != nil {
respondError(w, apiError{ respondError(w, apiError{
typ: errorBadData, typ: errorInternal,
err: err, err: err,
}, nil) }, nil)
return return
@ -353,7 +352,15 @@ func respond(w http.ResponseWriter, data interface{}) {
func respondError(w http.ResponseWriter, apiErr apiError, data interface{}) { func respondError(w http.ResponseWriter, apiErr apiError, data interface{}) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
w.WriteHeader(422)
switch apiErr.typ {
case errorBadData:
w.WriteHeader(http.StatusBadRequest)
case errorInternal:
w.WriteHeader(http.StatusInternalServerError)
default:
panic(fmt.Sprintf("unknown error type", apiErr))
}
b, err := json.Marshal(&response{ b, err := json.Marshal(&response{
Status: statusError, Status: statusError,
@ -364,6 +371,8 @@ func respondError(w http.ResponseWriter, apiErr apiError, data interface{}) {
if err != nil { if err != nil {
return return
} }
log.Errorf("api error: %v", apiErr)
w.Write(b) w.Write(b)
} }