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 gelf uncompressed scheme #3

Merged
merged 1 commit into from
Jan 25, 2016

Conversation

dqminh
Copy link

@dqminh dqminh commented Jan 25, 2016

The previous code (#2) was based on lusis/gelfd@79b893a but apparently the scheme was changed for GelfMessage.java i.e. no more magic header.

This removes the magic header and also optimize the ReadMessage code a bit i.e.
no more temporary buffer to store the uncompressed json.

Verified

This commit was signed with the committer’s verified signature.
pradyunsg Pradyun Gedam
The previous code was based on lusis/gelfd@79b893a
but apparently the scheme was changed for https://github.com/Graylog2/graylog2-server/blob/master/graylog2-server/src/main/java/org/graylog2/inputs/codecs/gelf/GELFMessage.java#L147
i.e. no more magic header.

This removes the magic header and also optimize the ReadMessage code a bit i.e.
no more temporary buffer to store the uncompressed json.

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
@dqminh
Copy link
Author

dqminh commented Jan 25, 2016

ping @mariussturm

tested this manually with a container running graylog2 locally. Let me know if this looks right.

mariussturm pushed a commit that referenced this pull request Jan 25, 2016
@mariussturm mariussturm merged commit 06974fc into Graylog2:master Jan 25, 2016
@mariussturm
Copy link

Yeah, looks good. Will also do some testing later in the week. Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants