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

Check for conflict of rest_listen_uri and web_listen_uri #2652

Merged
merged 1 commit into from Aug 10, 2016
Merged

Conversation

@joschi
Copy link
Contributor

@joschi joschi commented Aug 10, 2016

Refs #2634

@joschi joschi added this to the 2.1.0 milestone Aug 10, 2016
@bernd bernd self-assigned this Aug 10, 2016
if ((restListenUri.getPort() == webListenUri.getPort()) &&
!restListenUri.getHost().equals(webListenUri.getHost()) &&
("0.0.0.0".equals(restListenUri.getHost()) || "0.0.0.0".equals(webListenUri.getHost()))) {
throw new ValidationException("Wildcard IP addresses cannot be used if the Graylog REST API and web interface listen on the same port.");

This comment has been minimized.

@bernd

bernd Aug 10, 2016
Member

How about adding the current settings of rest_listen_uri and web_listen_uri to the message? I think that makes it easier to debug.

This comment has been minimized.

@joschi

joschi Aug 10, 2016
Author Contributor

I was afraid the message would get too convoluted if those were added.

@bernd
Copy link
Member

@bernd bernd commented Aug 10, 2016

LGTM 👍

@bernd bernd merged commit c5ced76 into master Aug 10, 2016
4 checks passed
4 checks passed
@garybot2
ci-server-integration Jenkins build graylog2-server-integration-pr 1242 has succeeded
Details
@garybot2
ci-web-linter Jenkins build graylog-pr-linter-check 725 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
@bernd bernd deleted the check-wildcard branch Aug 10, 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