Merge remote-tracking branch 'origin/master' into upd-dnsproxy

AdguardTeam · Jul 10, 2024 · 4638117 · 4638117
2 parents 3de6224 + 130560b
commit 4638117
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/internal/dhcpsvc/db.go b/internal/dhcpsvc/db.go
@@ -106,6 +106,9 @@ func (srv *DHCPServer) dbLoad(ctx context.Context) (err error) {
 
 		return nil
 	}
+	defer func() {
+		err = errors.WithDeferred(err, file.Close())
+	}()
 
 	dl := &dataLeases{}
 	err = json.NewDecoder(file).Decode(dl)

diff --git a/internal/dhcpsvc/server_test.go b/internal/dhcpsvc/server_test.go
@@ -4,6 +4,7 @@ import (
 	"io/fs"
 	"net/netip"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -19,14 +20,14 @@ import (
 var testdata = os.DirFS("testdata")
 
 // newTempDB copies the leases database file located in the testdata FS, under
-// tb.Name()/leases.db, to a temporary directory and returns the path to the
+// tb.Name()/leases.json, to a temporary directory and returns the path to the
 // copied file.
 func newTempDB(tb testing.TB) (dst string) {
 	tb.Helper()
 
 	const filename = "leases.json"
 
-	data, err := fs.ReadFile(testdata, filepath.Join(tb.Name(), filename))
+	data, err := fs.ReadFile(testdata, path.Join(tb.Name(), filename))
 	require.NoError(tb, err)
 
 	dst = filepath.Join(tb.TempDir(), filename)