Skip to content

fix(dataexchange): rename cap→maxFiles to unshadow Go builtin (PILOT-185) #3

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

Merged
TeoSlayer merged 1 commit into from
May 28, 2026
Merged

fix(dataexchange): rename cap→maxFiles to unshadow Go builtin (PILOT-185) #3

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: 7 additions & 7 deletions service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,16 +295,16 @@ func (s *Service) saveInboxMessage(frame *Frame, from protocol.Addr) error {
// logged and the loop continues. Called periodically from
// saveInboxMessage.
func (s *Service) evictInboxOverflow(dir string) {
cap := s.cfg.InboxMaxFiles
if cap <= 0 {
cap = 10000
maxFiles := s.cfg.InboxMaxFiles
if maxFiles <= 0 {
maxFiles = 10000
}
entries, err := os.ReadDir(dir)
if err != nil {
slog.Debug("inbox evict: readdir", "dir", dir, "err", err)
return
}
if len(entries) <= cap {
if len(entries) <= maxFiles {
return
}
type aged struct {
Expand All @@ -322,14 +322,14 @@ func (s *Service) evictInboxOverflow(dir string) {
}
files = append(files, aged{name: e.Name(), mod: info.ModTime()})
}
if len(files) <= cap {
if len(files) <= maxFiles {
return
}
// Oldest first.
sort.Slice(files, func(i, j int) bool { return files[i].mod.Before(files[j].mod) })
toEvict := len(files) - cap
toEvict := len(files) - maxFiles
for i := 0; i < toEvict; i++ {
_ = os.Remove(filepath.Join(dir, files[i].name))
}
slog.Info("inbox eviction", "dir", dir, "evicted", toEvict, "remaining", cap)
slog.Info("inbox eviction", "dir", dir, "evicted", toEvict, "remaining", maxFiles)
}
Loading