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

Allow TLS in GELF HTTP input #1348

Merged
merged 1 commit into from Aug 11, 2015
Merged

Allow TLS in GELF HTTP input #1348

merged 1 commit into from Aug 11, 2015

Conversation

@joschi
Copy link
Contributor

@joschi joschi commented Aug 10, 2015

This PR moves the TLS settings from TcpTransport up into AbstractTcpTransport which "automagically" enables using TLS for other TCP-based transports like the HTTP transport used in the GELF HTTP input.

@joschi joschi added this to the 1.2.0 milestone Aug 10, 2015
@bernd bernd self-assigned this Aug 11, 2015
@bernd
Copy link
Member

@bernd bernd commented Aug 11, 2015

LGTM 👍

bernd added a commit that referenced this pull request Aug 11, 2015
Allow TLS in GELF HTTP input
@bernd bernd merged commit 41a95c6 into master Aug 11, 2015
2 checks passed
2 checks passed
ci Jenkins build graylog2-server-integration-pr 112 has succeeded
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@bernd bernd deleted the tls-tcp-transport branch Aug 11, 2015
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