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

Previews: prevent scheduler from running when image renderer is outdated (#45623)

Browse Source 
* #44449: prevent crawler from running when rendering service is outdated

* #44449: simplify
This commit is contained in:
Artur Wierzbicki 2022-02-18 21:29:18 +04:00 committed by GitHub
parent 7643ae6c5e
commit c04b0179ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/services/thumbs/crawler.go
View File

@ -3,6 +3,7 @@ package thumbs
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"os" "os"
"strings" "strings"
"sync" "sync"
@ -83,6 +84,16 @@ func (r *simpleCrawler) broadcastStatus() {
} }
func (r *simpleCrawler) Run(ctx context.Context, authOpts rendering.AuthOpts, mode CrawlerMode, theme models.Theme, thumbnailKind models.ThumbnailKind) error { func (r *simpleCrawler) Run(ctx context.Context, authOpts rendering.AuthOpts, mode CrawlerMode, theme models.Theme, thumbnailKind models.ThumbnailKind) error {
res, err := r.renderService.HasCapability(rendering.ScalingDownImages)
if err != nil {
return err
}
if !res.IsSupported {
return fmt.Errorf("cant run dashboard crawler - rendering service needs to be updated. "+
"current version: %s, requiredVersion: %s", r.renderService.Version(), res.SemverConstraint)
}
r.queueMutex.Lock() r.queueMutex.Lock()
if r.IsRunning() { if r.IsRunning() {
r.queueMutex.Unlock() r.queueMutex.Unlock()