Skip to content

Commit

Permalink
Reduce check-log errors when a file in the log directory has been rem…
Browse files Browse the repository at this point in the history
…oved at the moment of running check-log
  • Loading branch information
ne-sachirou committed Feb 22, 2024
1 parent a842bce commit b9fb42a
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions check-log/lib/check-log.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"context"
"crypto/md5"
"encoding/json"
"errors"
"fmt"
"io"
"log"
Expand Down Expand Up @@ -564,20 +565,21 @@ func saveState(f string, state *state) error {
var errFileNotFoundByInode = fmt.Errorf("old file not found")

func findFileByInode(inode uint, dir string) (string, error) {
entries, err := os.ReadDir(dir)
if err != nil {
return "", err
}
entries, readDirErr := os.ReadDir(dir)
for _, entry := range entries {
fi, err := entry.Info()
if err != nil {
if err != nil && !errors.Is(err, os.ErrNotExist) {
return "", err
}
if detectInode(fi) == inode {
return filepath.Join(dir, fi.Name()), nil
}
}
return "", errFileNotFoundByInode
err := errFileNotFoundByInode
if readDirErr != nil {
err = errors.Join(err, readDirErr)
}
return "", err
}

func openOldFile(f string, state *state) (*os.File, error) {
Expand Down

0 comments on commit b9fb42a

Please sign in to comment.