Skip to content

Automated Code Change #1585

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

Closed
copybara-service wants to merge 1 commit into from
+8 −0
Closed

Automated Code Change #1585

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
8 changes: 8 additions & 0 deletions extractor/filesystem/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"regexp"
"slices"
"strings"
"sync"
"time"

"github.com/gobwas/glob"
Expand Down Expand Up @@ -327,6 +328,7 @@ func RunFS(ctx context.Context, config *Config, wc *walkContext) (inventory.Inve
}

type walkContext struct {
mu sync.Mutex
//nolint:containedctx
ctx context.Context
stats stats.Collector
Expand Down Expand Up @@ -405,6 +407,8 @@ func walkIndividualPaths(wc *walkContext) error {
}

func (wc *walkContext) handleFile(path string, d fs.DirEntry, fserr error) error {
wc.mu.Lock()
defer wc.mu.Unlock()
wc.currentPath = path

wc.inodesVisited++
Expand Down Expand Up @@ -520,6 +524,8 @@ func (wc *walkContext) handleFile(path string, d fs.DirEntry, fserr error) error
}

func (wc *walkContext) postHandleFile(path string, d fs.DirEntry) {
wc.mu.Lock()
defer wc.mu.Unlock()
if len(wc.gitignores) > 0 && d.Type().IsDir() {
// Remove .gitignores that applied to this directory.
wc.gitignores = wc.gitignores[:len(wc.gitignores)-1]
Expand Down Expand Up @@ -741,6 +747,8 @@ func createFileErrorsForPlugin(errorMap map[string]error) []*plugin.FileError {
}

func (wc *walkContext) printStatus() {
wc.mu.Lock()
defer wc.mu.Unlock()
log.Infof("Status: new inodes: %d, %.1f inodes/s, new extract calls: %d, path: %q\n",
wc.inodesVisited-wc.lastInodes,
float64(wc.inodesVisited-wc.lastInodes)/time.Since(wc.lastStatus).Seconds(),
Expand Down
Loading