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.

Sign up for GitHub

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

Migrate to Netty 4.1 #4397

Merged
merged 14 commits into from
Jan 18, 2018
Merged

Migrate to Netty 4.1 #4397

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
076aa54
Migrate to Netty 4.1
Nov 10, 2017
17fc039
Revert changes to vendor-module-ids.json and yarn.lock
Dec 5, 2017
0786fb8
Add support for native SSL (OpenSSL) bindings
Dec 6, 2017
2655734
Wait for transport being started completely in UdpTransportTest
Dec 7, 2017
8086802
Refactor getBaseChannelHandlers/getFinalChannelHandlers
Dec 11, 2017
a091c68
Upgrade to Netty 4.1.18.Final
Dec 11, 2017
4ac9029
Fix throughput and connection counters for Netty-based transports
Dec 15, 2017
24563a9
Use read bytes for CodecAggregator.Result in GelfChunkAggregator
Jan 3, 2018
0743fcc
Refactor NettyTransport#getLocalAddress()
Jan 3, 2018
e9a7f83
Upgrade to Netty 4.1.19.Final
Jan 4, 2018
6cddd57
Allow configuring the number of worker threads per Netty transport
Jan 8, 2018
6eaca93
Remove support for Netty OIO (old I/O) transports
Jan 8, 2018
2ab9b8a
Remove outdated TODOs
Jan 11, 2018
1df8385
Use locale metric registry for transport-specific metrics
Jan 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use read bytes for CodecAggregator.Result in GelfChunkAggregator
  • Loading branch information
Jochen Schalanda committed Jan 11, 2018
commit 24563a90b546a71f6ef578d57a6dd8a49903d01f
2 changes: 1 addition & 1 deletion graylog2-server/src/main/java/org/graylog2/inputs/codecs/GelfChunkAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public Result addChunk(ByteBuf buffer) {
case ZLIB:
case GZIP:
case UNCOMPRESSED:
aggregatedBuffer = buffer;
aggregatedBuffer = Unpooled.wrappedBuffer(readable);
break;
case UNSUPPORTED:
return INVALID_RESULT;
Expand Down