From c3e46eaa8fd73bf6ef7791e8b8112b34358558a3 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 27 Oct 2021 08:41:47 -0600 Subject: [PATCH] Rendering: Check if default image exists to avoid breaking reports if it's moved (#40930) (#40991) (cherry picked from commit 37cbed4b4810ffc55b96b0027f9fd723152e5ea8) Co-authored-by: Selene --- pkg/services/rendering/rendering.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/services/rendering/rendering.go b/pkg/services/rendering/rendering.go index 45dfd2c6bfd..0d8aadf259c 100644 --- a/pkg/services/rendering/rendering.go +++ b/pkg/services/rendering/rendering.go @@ -159,9 +159,13 @@ func (rs *RenderingService) Version() string { func (rs *RenderingService) RenderErrorImage(err error) (*RenderResult, error) { imgUrl := "public/img/rendering_error.png" + imgPath := filepath.Join(setting.HomePath, imgUrl) + if _, err := os.Stat(imgPath); errors.Is(err, os.ErrNotExist) { + return nil, err + } return &RenderResult{ - FilePath: filepath.Join(setting.HomePath, imgUrl), + FilePath: imgPath, }, nil }