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

Properly shut down crawler in case one prospector is misconfigured #4037

Merged
merged 1 commit into from
Apr 19, 2017

Conversation

ruflin
Copy link
Member

@ruflin ruflin commented Apr 18, 2017

If one prospector started to already send data and a second one was misconfigured, the beat paniced during shutdown. This is no prevented by properly shutting down the crawler also on error.

Closes #3917

@ruflin ruflin added Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. review labels Apr 18, 2017
@ruflin
Copy link
Member Author

ruflin commented Apr 18, 2017

This needs backport to 5.3 and 5.4

@@ -32,6 +32,10 @@ func NewLog(p *Prospector) (*Log, error) {
config: p.config,
}

if len(p.config.Paths) == 0 {
return nil, fmt.Errorf("Each prospector must have at least one path defined.")
Copy link
Collaborator

Choose a reason for hiding this comment

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

[golint] reported by reviewdog 🐶
error strings should not be capitalized or end with punctuation or a newline

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@exekias
Copy link
Contributor

exekias commented Apr 18, 2017

LGTM, can you address reviewdog comment and add a changelog?

If one prospector started to already send data and a second one was misconfigured, the beat paniced during shutdown. This is no prevented by properly shutting down the crawler also on error.

Closes elastic#3917
@ruflin
Copy link
Member Author

ruflin commented Apr 19, 2017

@exekias Updated

@exekias exekias merged commit 95195cc into elastic:master Apr 19, 2017
@ruflin ruflin deleted the fb-panic-fix branch April 19, 2017 08:54
ruflin added a commit to ruflin/beats that referenced this pull request Apr 19, 2017
…lastic#4037)

If one prospector started to already send data and a second one was misconfigured, the beat paniced during shutdown. This is no prevented by properly shutting down the crawler also on error.

Closes elastic#3917
(cherry picked from commit 95195cc)
ruflin added a commit to ruflin/beats that referenced this pull request Apr 19, 2017
…lastic#4037)

If one prospector started to already send data and a second one was misconfigured, the beat paniced during shutdown. This is no prevented by properly shutting down the crawler also on error.

Closes elastic#3917
(cherry picked from commit 95195cc)
ruflin added a commit to ruflin/beats that referenced this pull request Apr 19, 2017
…lastic#4037)

If one prospector started to already send data and a second one was misconfigured, the beat paniced during shutdown. This is no prevented by properly shutting down the crawler also on error.

Closes elastic#3917
(cherry picked from commit 95195cc)
exekias pushed a commit that referenced this pull request Apr 19, 2017
…4037) (#4048)

If one prospector started to already send data and a second one was misconfigured, the beat paniced during shutdown. This is no prevented by properly shutting down the crawler also on error.

Closes #3917
(cherry picked from commit 95195cc)
exekias pushed a commit that referenced this pull request Apr 19, 2017
…4037) (#4046)

If one prospector started to already send data and a second one was misconfigured, the beat paniced during shutdown. This is no prevented by properly shutting down the crawler also on error.

Closes #3917
(cherry picked from commit 95195cc)
monicasarbu pushed a commit that referenced this pull request Apr 20, 2017
…4037) (#4047)

If one prospector started to already send data and a second one was misconfigured, the beat paniced during shutdown. This is no prevented by properly shutting down the crawler also on error.

Closes #3917
(cherry picked from commit 95195cc)
@ruflin ruflin removed the needs_backport PR is waiting to be backported to other branches. label May 8, 2017
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