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

notifications: read without tran, write with tran

Browse Source
This commit is contained in:
bergquist
2018-06-29 15:15:31 +02:00
parent 8ff538be07
commit 396f8e6464
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/alerting/notifier.go
View File

@@ -72,7 +72,7 @@ func (n *notificationService) sendNotifications(evalContext *EvalContext, notifi
// Verify that we can send the notification again
// but this time within the same transaction.
if !evalContext.IsTestRun && !not.ShouldNotify(evalContext) {
if !evalContext.IsTestRun && !not.ShouldNotify(context.Background(), evalContext) {
return nil
}
@@ -91,7 +91,7 @@ func (n *notificationService) sendNotifications(evalContext *EvalContext, notifi
Success: success,
}
return bus.DispatchCtx(evalContext.Ctx, cmd)
return bus.DispatchCtx(ctx, cmd)
})
})
}
@@ -149,7 +149,7 @@ func (n *notificationService) getNeededNotifiers(orgId int64, notificationIds []
return nil, err
}
if not.ShouldNotify(evalContext) {
if not.ShouldNotify(evalContext.Ctx, evalContext) {
result = append(result, not)
}
}