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 GrokPatternRegistry.GrokReloader#load() #2577

Merged
merged 1 commit into from Aug 2, 2016
Merged

Conversation

@joschi
Copy link
Contributor

@joschi joschi commented Aug 1, 2016

GrokPatternRegistry.GrokReloader#load() used to run an unnecessary yet incorrect check whether the Grok pattern's name or the pattern itself was null or empty.

This check is already done by Grok itself and will throw a detailed exception which can be caught further up the stack.

Additionally this PR extracts the root cause of exceptions happening in the cachedGrokForPattern() method instead of simply propagating the wrapped ExecutionException and even adds a test for this.

Refs #2566

@joschi joschi added this to the 2.1.0 milestone Aug 1, 2016
@edmundoa edmundoa self-assigned this Aug 2, 2016
@edmundoa
Copy link
Member

@edmundoa edmundoa commented Aug 2, 2016

LGTM 👍

@edmundoa edmundoa merged commit d07a2d9 into master Aug 2, 2016
4 checks passed
4 checks passed
@garybot2
ci-server-integration Jenkins build graylog2-server-integration-pr 1193 has succeeded
Details
@garybot2
ci-web-linter Jenkins build graylog-pr-linter-check 676 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@edmundoa edmundoa deleted the grok-pattern-registry branch Aug 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants