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 extractor and static fields creation in multi-node setups #2584

Merged
merged 1 commit into from Aug 2, 2016
Merged

Conversation

@bernd
Copy link
Member

@bernd bernd commented Aug 2, 2016

The extractor and static fields resource was using the local input
registry to check if an input exists. This breaks in a multi-node setup
where the web interface runs on node A and the input on node B.

Fixes #2580

The extractor and static fields resource was using the local input
registry to check if an input exists. This breaks in a multi-node setup
where the web interface runs on node A and the input on node B.

Fixes #2580
@bernd bernd added this to the 2.1.0 milestone Aug 2, 2016
}

final Input mongoInput = inputService.find(input.getPersistId());
final Input mongoInput = inputService.find(inputId);

This comment has been minimized.

@kroepke

kroepke Aug 2, 2016
Member

I think we should test for null here. If we don't it's probably harmless, but the error wouldn't be nice.

This comment has been minimized.

@bernd

bernd Aug 2, 2016
Author Member

}

final Input mongoInput = inputService.find(input.getPersistId());
final Input mongoInput = inputService.find(inputId);

This comment has been minimized.

@kroepke

kroepke Aug 2, 2016
Member

Same null check here

This comment has been minimized.

@bernd

bernd Aug 2, 2016
Author Member

See above

@kroepke
Copy link
Member

@kroepke kroepke commented Aug 2, 2016

other than the null check comments, lgtm 👍

@joschi joschi self-assigned this Aug 2, 2016
@joschi
Copy link
Contributor

@joschi joschi commented Aug 2, 2016

LGTM. 👍

@joschi joschi merged commit 61656d4 into master Aug 2, 2016
4 checks passed
4 checks passed
ci-server-integration Jenkins build graylog2-server-integration-pr 1196 has succeeded
Details
ci-web-linter Jenkins build graylog-pr-linter-check 679 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
@joschi joschi deleted the issue-2580 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

3 participants
You can’t perform that action at this time.