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

Rendering: makes sure IsAvailable can be used during init of other services (#23817)

Browse Source 
* Rendering: makes sure service knows if it is configured after Init()

* Rendering: refactor
This commit is contained in:
Leonard Gram 2020-04-23 14:44:52 +02:00 committed by GitHub
parent 0284747c88
commit ebdbb0c96d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/services/rendering/rendering.go
View File

@ -22,7 +22,11 @@ import (
func init() { func init() {
remotecache.Register(&RenderUser{}) remotecache.Register(&RenderUser{})
registry.RegisterService(&RenderingService{}) registry.Register(&registry.Descriptor{
Name: "RenderingService",
Instance: &RenderingService{},
InitPriority: registry.High,
})
} }
const renderKeyPrefix = "render-%s" const renderKeyPrefix = "render-%s"
@ -68,7 +72,7 @@ func (rs *RenderingService) Init() error {
} }
func (rs *RenderingService) Run(ctx context.Context) error { func (rs *RenderingService) Run(ctx context.Context) error {
if rs.Cfg.RendererUrl != "" { if rs.remoteAvailable() {
rs.log = rs.log.New("renderer", "http") rs.log = rs.log.New("renderer", "http")
rs.log.Info("Backend rendering via external http server") rs.log.Info("Backend rendering via external http server")
rs.renderAction = rs.renderViaHttp rs.renderAction = rs.renderViaHttp
@ -76,7 +80,7 @@ func (rs *RenderingService) Run(ctx context.Context) error {
return nil return nil
} }
if plugins.Renderer != nil { if rs.pluginAvailable() {
rs.log = rs.log.New("renderer", "plugin") rs.log = rs.log.New("renderer", "plugin")
rs.pluginInfo = plugins.Renderer rs.pluginInfo = plugins.Renderer
@ -97,8 +101,16 @@ func (rs *RenderingService) Run(ctx context.Context) error {
return nil return nil
} }
func (rs *RenderingService) pluginAvailable() bool {
return plugins.Renderer != nil
}
func (rs *RenderingService) remoteAvailable() bool {
return rs.Cfg.RendererUrl != ""
}
func (rs *RenderingService) IsAvailable() bool { func (rs *RenderingService) IsAvailable() bool {
return rs.renderAction != nil return rs.remoteAvailable() || rs.pluginAvailable()
} }
func (rs *RenderingService) RenderErrorImage(err error) (*RenderResult, error) { func (rs *RenderingService) RenderErrorImage(err error) (*RenderResult, error) {