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

Cleanup Filebeat code #1975

Merged
merged 1 commit into from
Jul 12, 2016
Merged

Cleanup Filebeat code #1975

merged 1 commit into from
Jul 12, 2016

Conversation

ruflin
Copy link
Contributor

@ruflin ruflin commented Jul 6, 2016

Some simplifications / cleanup to the filebeat code.

Meta issue: #1913

@ruflin ruflin mentioned this pull request Jul 6, 2016
11 tasks
CloseEOF bool
Backoff time.Duration
MaxBackoff time.Duration
BackoffFactor int
Copy link

Choose a reason for hiding this comment

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

I think I like BackoffDuration better, as we've got 3 configs with Backoff here. Alternatively:

type BackoffConfig struct {
    Duration time.Duration
    Max time.Duration
    Factor float32
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The naming change is to make reader configs consitent with the harvester config names.

+1 on the suggested struct, but then we should have it in libbeat.

Copy link

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It doesn't have the factor as it is just uses *2. We should do a more generic cleanup across all beats in an other PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@urso this is now also part of this meta issue here: #1913

@@ -39,6 +27,7 @@ func New(spooler *spooler.Spooler, prospectorConfigs []*common.Config) (*Crawler
return &Crawler{
spooler: spooler,
prospectorConfigs: prospectorConfigs,
wg: sync.WaitGroup{},
Copy link
Member

Choose a reason for hiding this comment

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

This line isn't necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed

* Cleanup variable names in filebeat.yml.j2
* Cleanup spooler
* Unify variable names
@urso urso merged commit f1ed821 into elastic:master Jul 12, 2016
@ruflin ruflin deleted the fb-review branch July 12, 2016 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants