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.

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

Fix filecount for paths with trailing slash #6332

Merged
merged 2 commits into from
Sep 6, 2019

Conversation

danielnelson
Copy link
Contributor

@danielnelson danielnelson commented Aug 30, 2019

Paths returned during the walk have had filepath.Clean applied to them, so we need to create a glob that will match these cleaned paths.

closes #6329

Required for all PRs:

  • Signed CLA.
  • Associated README.md updated.
  • Has appropriate unit tests.

@danielnelson danielnelson added the fix pr to fix corresponding bug label Aug 30, 2019
@danielnelson danielnelson added this to the 1.12.0 milestone Aug 30, 2019
@@ -156,6 +157,7 @@ func (fc *FileCount) count(acc telegraf.Accumulator, basedir string, glob globpa
childSize := make(map[string]int64)

walkFn := func(path string, de *godirwalk.Dirent) error {
fmt.Println(path)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this leftover print.

@danielnelson danielnelson modified the milestones: 1.12.0, 1.12.1 Sep 3, 2019
@danielnelson danielnelson merged commit 7ac5dc5 into master Sep 6, 2019
@danielnelson danielnelson deleted the filecount-trailing-slash branch September 6, 2019 19:38
danielnelson added a commit that referenced this pull request Sep 6, 2019
bitcharmer pushed a commit to bitcharmer/telegraf that referenced this pull request Oct 18, 2019
athoune pushed a commit to bearstech/telegraf that referenced this pull request Apr 17, 2020
idohalevi pushed a commit to idohalevi/telegraf that referenced this pull request Sep 29, 2020
arstercz pushed a commit to arstercz/telegraf that referenced this pull request Mar 5, 2023
arstercz pushed a commit to arstercz/telegraf that referenced this pull request Mar 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix pr to fix corresponding bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Filecount: Trailing slash in directories does not work
2 participants