vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-17 02:29:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix fs error handling

Browse source
This commit is contained in:
Daniel 2022-10-11 12:20:45 +02:00
parent 2b4c15c1f7
commit 0d3a0ebb95
10 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
database/registry.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io/fs"
"os"
"path"
"regexp"
@ -116,7 +117,7 @@ func loadRegistry() error {
filePath := path.Join(rootStructure.Path, registryFileName)
data, err := os.ReadFile(filePath)
if err != nil {
if os.IsNotExist(err) {
if errors.Is(err, fs.ErrNotExist) {
return nil
}
return err

11
database/storage/fstree/fstree.go
View file

@ -8,6 +8,7 @@ import (
"context"
"errors"
"fmt"
"io/fs"
"os"
"path/filepath"
"runtime"
@ -46,7 +47,7 @@ func NewFSTree(name, location string) (storage.Interface, error) {
file, err := os.Stat(basePath)
if err != nil {
if os.IsNotExist(err) {
if errors.Is(err, fs.ErrNotExist) {
err = os.MkdirAll(basePath, defaultDirMode)
if err != nil {
return nil, fmt.Errorf("fstree: failed to create directory %s: %w", basePath, err)
@ -89,7 +90,7 @@ func (fst *FSTree) Get(key string) (record.Record, error) {
data, err := os.ReadFile(dstPath)
if err != nil {
if os.IsNotExist(err) {
if errors.Is(err, fs.ErrNotExist) {
return nil, storage.ErrNotFound
}
return nil, fmt.Errorf("fstree: failed to read file %s: %w", dstPath, err)
@ -176,7 +177,7 @@ func (fst *FSTree) Query(q *query.Query, local, internal bool) (*iterator.Iterat
walkRoot = walkPrefix
case err == nil:
walkRoot = filepath.Dir(walkPrefix)
case os.IsNotExist(err):
case errors.Is(err, fs.ErrNotExist):
walkRoot = filepath.Dir(walkPrefix)
default: // err != nil
return nil, fmt.Errorf("fstree: could not stat query root %s: %w", walkPrefix, err)
@ -211,7 +212,7 @@ func (fst *FSTree) queryExecutor(walkRoot string, queryIter *iterator.Iterator,
// read file
data, err := os.ReadFile(path)
if err != nil {
if os.IsNotExist(err) {
if errors.Is(err, fs.ErrNotExist) {
return nil
}
return fmt.Errorf("fstree: failed to read file %s: %w", path, err)
@ -274,7 +275,7 @@ func (fst *FSTree) Shutdown() error {
return nil
}
// writeFile mirrors ioutil.WriteFile, replacing an existing file with the same
// writeFile mirrors os.WriteFile, replacing an existing file with the same
// name atomically. This is not atomic on Windows, but still an improvement.
// TODO: Replace with github.com/google/renamio.WriteFile as soon as it is fixed on Windows.
// TODO: This has become a wont-fix. Explore other options.