diff --git a/data/png/77dedee4f4d479cea6f9d608353ed098.png b/data/png/77dedee4f4d479cea6f9d608353ed098.png new file mode 100644 index 00000000000..43598440c81 Binary files /dev/null and b/data/png/77dedee4f4d479cea6f9d608353ed098.png differ diff --git a/data/png/9e956287bee2bc4eabd91f9bb06ab458.png b/data/png/9e956287bee2bc4eabd91f9bb06ab458.png new file mode 100644 index 00000000000..e43d8dc1906 Binary files /dev/null and b/data/png/9e956287bee2bc4eabd91f9bb06ab458.png differ diff --git a/grafana b/grafana deleted file mode 160000 index d5471c153ab..00000000000 --- a/grafana +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d5471c153ab8ab0d4be57154300d28a75af1d363 diff --git a/pkg/api/render.go b/pkg/api/render.go index 18deb8e20b2..e23ffa65c6a 100644 --- a/pkg/api/render.go +++ b/pkg/api/render.go @@ -20,10 +20,11 @@ func RenderToPng(c *middleware.Context) { } renderOpts.Url = "http://localhost:3000/" + renderOpts.Url - pngPath, err := renderer.RenderToPng(renderOpts) + if err != nil { - c.HTML(500, "error.html", nil) + c.Handle(500, "Failed to render to png", err) + return } c.Resp.Header().Set("Content-Type", "image/png") diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index d62e9950dbf..d1662cfa0fa 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -88,12 +88,7 @@ func (ctx *Context) Handle(status int, title string, err error) { } } - switch status { - case 404: - ctx.Data["Title"] = "Page Not Found" - case 500: - ctx.Data["Title"] = "Internal Server Error" - } + ctx.Data["Title"] = title ctx.HTML(status, strconv.Itoa(status)) } diff --git a/src/app/features/account/partials/account.html b/src/app/features/account/partials/account.html index 9a4d9d3d7c9..8382552a1bc 100644 --- a/src/app/features/account/partials/account.html +++ b/src/app/features/account/partials/account.html @@ -22,8 +22,6 @@
- -
diff --git a/src/views/500.html b/src/views/500.html new file mode 100644 index 00000000000..e7a740df6ba --- /dev/null +++ b/src/views/500.html @@ -0,0 +1,32 @@ + + + + + + + + Grafana + + + + + + + + +
+
+ + Server side error :( + +
+ +
+

[[.Title]]

+ [[.ErrorMsg]] +
+
+ + + +