From f3b8750339d65fc25714c8f92f8afacefb6a727d Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Mon, 27 May 2024 17:14:17 +0200
Subject: [PATCH] Join errors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
---
 promql/query_logger.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/promql/query_logger.go b/promql/query_logger.go
index 76528f958..7e06ebb97 100644
--- a/promql/query_logger.go
+++ b/promql/query_logger.go
@@ -16,6 +16,7 @@ package promql
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -93,14 +94,14 @@ type mmapedFile struct {
 
 func (f *mmapedFile) Close() error {
 	err := f.m.Unmap()
-	if fErr := f.f.Close(); fErr != nil && err == nil {
-		return fmt.Errorf("close mmapedFile.f: %w", fErr)
+	if err != nil {
+		err = fmt.Errorf("mmapedFile: unmapping: %w", err)
+	}
+	if fErr := f.f.Close(); fErr != nil {
+		return errors.Join(fmt.Errorf("close mmapedFile.f: %w", fErr), err)
 	}
 
-	if err != nil {
-		return fmt.Errorf("mmapedFile: unmapping: %w", err)
-	}
-	return nil
+	return err
 }
 
 func getMMapedFile(filename string, filesize int, logger log.Logger) ([]byte, io.Closer, error) {