fix: joining errors

prit342 · May 24, 2023 · 468ec86 · 468ec86
1 parent cb4bc34
commit 468ec86
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/internal/certs/get_cert_pem.go b/internal/certs/get_cert_pem.go
@@ -138,10 +138,11 @@ func (tc *TLSClient) TLSDial() (certs []*x509.Certificate, err error) {
 	}
 
 	defer func() {
-		if conn != nil {
-			if cerr := conn.Close(); cerr != nil && err == nil {
-				err = fmt.Errorf("error closing connection: %w", cerr)
-			}
+		if conn == nil { // ensure we don't panic
+			return
+		}
+		if closeErr := conn.Close(); closeErr != nil { // close the connection
+			err = errors.Join(err, closeErr) // return both the errors
 		}
 	}()