From 1b38d94537466adb5e43c4568844fcccc83f0093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Gyllensw=C3=A4rd?= Date: Wed, 20 Nov 2019 09:26:59 +0100 Subject: [PATCH] Image-rendering: Cleanup of rendering code (#20496) --- pkg/services/rendering/interface.go | 3 +-- pkg/services/rendering/rendering.go | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/services/rendering/interface.go b/pkg/services/rendering/interface.go index c959960aff8..6021ac2fe3c 100644 --- a/pkg/services/rendering/interface.go +++ b/pkg/services/rendering/interface.go @@ -26,8 +26,7 @@ type Opts struct { } type RenderResult struct { - FilePath string - KeepFileAfterRender bool + FilePath string } type renderFunc func(ctx context.Context, options Opts) (*RenderResult, error) diff --git a/pkg/services/rendering/rendering.go b/pkg/services/rendering/rendering.go index e3cce5d30e5..f025d481f53 100644 --- a/pkg/services/rendering/rendering.go +++ b/pkg/services/rendering/rendering.go @@ -96,16 +96,14 @@ func (rs *RenderingService) RenderErrorImage(err error) (*RenderResult, error) { imgUrl := "public/img/rendering_error.png" return &RenderResult{ - FilePath: filepath.Join(setting.HomePath, imgUrl), - KeepFileAfterRender: true, + FilePath: filepath.Join(setting.HomePath, imgUrl), }, nil } func (rs *RenderingService) Render(ctx context.Context, opts Opts) (*RenderResult, error) { if rs.inProgressCount > opts.ConcurrentLimit { return &RenderResult{ - FilePath: filepath.Join(setting.HomePath, "public/img/rendering_limit.png"), - KeepFileAfterRender: true, + FilePath: filepath.Join(setting.HomePath, "public/img/rendering_limit.png"), }, nil }