Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce check-log errors when a file in the log directory has been removed at the moment of running check-log #823

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Reduce check-log errors when a file in the log directory has been removed at the moment of running check-log #823

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions check-log/lib/check-log.go
View file
Open in desktop
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
Loading