mirror of
https://github.com/grafana/grafana.git
synced 2026-08-12 06:05:02 -05:00
Chore: Check errors from Close calls (#29562)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
@@ -49,7 +49,11 @@ func (az *AzureBlobUploader) Upload(ctx context.Context, imageDiskPath string) (
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer file.Close()
|
||||
defer func() {
|
||||
if err := file.Close(); err != nil {
|
||||
az.log.Warn("Failed to close file", "path", imageDiskPath, "err", err)
|
||||
}
|
||||
}()
|
||||
|
||||
randomFileName, err := util.GetRandomString(30)
|
||||
if err != nil {
|
||||
|
||||
@@ -153,7 +153,11 @@ func (u *Uploader) uploadFile(
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer fileReader.Close()
|
||||
defer func() {
|
||||
if err := fileReader.Close(); err != nil {
|
||||
u.log.Warn("Failed to close file", "err", err, "path", imageDiskPath)
|
||||
}
|
||||
}()
|
||||
|
||||
// Set public access if not generating a signed URL
|
||||
pubAcc := !u.enableSignedURLs
|
||||
|
||||
@@ -80,12 +80,17 @@ func (u *S3Uploader) Upload(ctx context.Context, imageDiskPath string) (string,
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer file.Close()
|
||||
defer func() {
|
||||
if err := file.Close(); err != nil {
|
||||
u.log.Warn("Failed to close file", "path", imageDiskPath, "err", err)
|
||||
}
|
||||
}()
|
||||
|
||||
sess, err = session.NewSession(cfg)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
uploader := s3manager.NewUploader(sess)
|
||||
result, err := uploader.UploadWithContext(ctx, &s3manager.UploadInput{
|
||||
Bucket: aws.String(u.bucket),
|
||||
|
||||
Reference in New Issue
Block a user