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

Jump to bottom

Keep remote address in NettyTransport with message aggregation #3988

Merged
merged 1 commit into from Jul 11, 2017
Merged

Keep remote address in NettyTransport with message aggregation #3988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions graylog2-server/src/main/java/org/graylog2/plugin/inputs/transports/NettyTransport.java
View file
Open in desktop
Expand Up @@ -305,7 +305,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Ex
final ChannelBuffer completeMessage = result.getMessage();
if (completeMessage != null) {
log.debug("Message aggregation completion, forwarding {}", completeMessage);
fireMessageReceived(ctx, completeMessage);
fireMessageReceived(ctx, completeMessage, e.getRemoteAddress());
} else if (result.isValid()) {
log.debug("More chunks necessary to complete this message");
} else {
Expand All @@ -314,7 +314,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Ex
}
} else {
log.debug("Could not handle netty message {}, sending further upstream.", e);
fireMessageReceived(ctx, message);
fireMessageReceived(ctx, message, e.getRemoteAddress());
}
}
}
Expand Down