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

Alerting: Use hash of opts in singleflight (#58474)

Browse Source
This commit is contained in:
George Robinson 2022-11-08 22:37:49 +00:00 committed by GitHub
parent 72275e97d2
commit ad9ac85ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/ngalert/image/service.go
View File

@ -2,6 +2,7 @@ package image
import ( import (
"context" "context"
"encoding/base64"
"errors" "errors"
"fmt" "fmt"
"time" "time"
@ -135,8 +136,8 @@ func (s *ScreenshotImageService) NewImage(ctx context.Context, r *models.AlertRu
Timeout: screenshotTimeout, Timeout: screenshotTimeout,
} }
k := fmt.Sprintf("%s-%d-%s", opts.DashboardUID, opts.PanelID, opts.Theme) optsHash := base64.StdEncoding.EncodeToString(opts.Hash())
result, err, _ := s.singleflight.Do(k, func() (interface{}, error) { result, err, _ := s.singleflight.Do(optsHash, func() (interface{}, error) {
screenshot, err := s.limiter.Do(ctx, opts, s.screenshots.Take) screenshot, err := s.limiter.Do(ctx, opts, s.screenshots.Take)
if err != nil { if err != nil {
if errors.Is(err, dashboards.ErrDashboardNotFound) { if errors.Is(err, dashboards.ErrDashboardNotFound) {