IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

clearer errors

Browse Source 
"Not found" should only be for http path/method not found (404)
if it's about specific resources, we should be explicit for clarity
This commit is contained in:
Dieter Plaetinck 2015-07-07 12:51:38 -07:00 committed by Torkel Ödegaard
parent f6ad386ba7
commit 66ba19b7ba
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dashboard_snapshot.go
View File

@ -59,7 +59,7 @@ func GetDashboardSnapshot(c *middleware.Context) {
// expired snapshots should also be removed from db // expired snapshots should also be removed from db
if snapshot.Expires.Before(time.Now()) { if snapshot.Expires.Before(time.Now()) {
c.JsonApiErr(404, "Snapshot not found", err) c.JsonApiErr(404, "Dashboard snapshot not found", err)
return return
} }

1
pkg/models/dashboards.go
View File

@ -11,6 +11,7 @@ import (
// Typed errors // Typed errors
var ( var (
ErrDashboardNotFound = errors.New("Dashboard not found") ErrDashboardNotFound = errors.New("Dashboard not found")
ErrDashboardSnapshotNotFound = errors.New("Dashboard snapshot not found")
ErrDashboardWithSameNameExists = errors.New("A dashboard with the same name already exists") ErrDashboardWithSameNameExists = errors.New("A dashboard with the same name already exists")
ErrDashboardVersionMismatch = errors.New("The dashboard has been changed by someone else") ErrDashboardVersionMismatch = errors.New("The dashboard has been changed by someone else")
) )

4
pkg/models/models.go
View File

@ -1,7 +1,5 @@
package models package models
import "errors"
type OAuthType int type OAuthType int
const ( const (
@ -9,5 +7,3 @@ const (
GOOGLE GOOGLE
TWITTER TWITTER
) )
var ErrNotFound = errors.New("Not found")

2
pkg/services/sqlstore/dashboard_snapshot.go
View File

@ -57,7 +57,7 @@ func GetDashboardSnapshot(query *m.GetDashboardSnapshotQuery) error {
if err != nil { if err != nil {
return err return err
} else if has == false { } else if has == false {
return m.ErrNotFound return m.ErrDashboardSnapshotNotFound
} }
query.Result = &snapshot query.Result = &snapshot