IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix slack receiver to close file descriptors when they're not needed anymore (#60178)

Browse Source
This commit is contained in:
Yuri Tseretyan 2022-12-12 11:19:02 -05:00 committed by GitHub
parent 22736cc93b
commit df7f636759
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/ngalert/notifier/channels/slack.go
View File

@ -477,6 +477,11 @@ func (sn *SlackNotifier) createImageMultipart(image ngmodels.Image, channel, com
if err != nil {
return nil, nil, err
}
defer func() {
if err := f.Close(); err != nil {
sn.log.Error("Failed to close image file reader", "error", err)
}
}()
fw, err := w.CreateFormFile("file", image.Path)
if err != nil {

1
pkg/services/ngalert/notifier/channels/slack_test.go
View File

@ -409,6 +409,7 @@ func setupSlackForTests(t *testing.T, settings string) (*SlackNotifier, *slackRe
f, err := os.Create(t.TempDir() + "test.png")
require.NoError(t, err)
t.Cleanup(func() {
_ = f.Close()
if err := os.Remove(f.Name()); err != nil {
t.Logf("failed to delete test file: %s", err)
}