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 issue-8695:DefaultFuture turn off logging optimization for Channel #8775

Merged
merged 2 commits into from Sep 12, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Expand Up @@ -137,6 +137,15 @@ public Request copy() {
return copy;
}

public Request copyWithoutData(){
Request copy = new Request(mId);
copy.mVersion = this.mVersion;
copy.mTwoWay = this.mTwoWay;
copy.mEvent = this.mEvent;
copy.mBroken = this.mBroken;
return copy;
}

@Override
public String toString() {
return "Request [id=" + mId + ", version=" + mVersion + ", twoway=" + mTwoWay + ", event=" + mEvent
Expand Down
Expand Up @@ -147,7 +147,7 @@ public static void closeChannel(Channel channel) {
disconnectResponse.setErrorMessage("Channel " +
channel +
" is inactive. Directly return the unFinished request : " +
future.getRequest());
getRequestWithoutData(future.getRequest()));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here use logger.isDebugEnabled() to judge is print data also.

DefaultFuture.received(channel, disconnectResponse);
}
}
Expand Down Expand Up @@ -251,14 +251,12 @@ private String getTimeoutMessage(boolean scan) {
+ (sent > 0 ? " client elapsed: " + (sent - start)
+ " ms, server elapsed: " + (nowTimestamp - sent)
: " elapsed: " + (nowTimestamp - start)) + " ms, timeout: "
+ timeout + " ms, request: " + (logger.isDebugEnabled() ? request : getRequestWithoutData()) + ", channel: " + channel.getLocalAddress()
+ timeout + " ms, request: " + (logger.isDebugEnabled() ? request : getRequestWithoutData(request)) + ", channel: " + channel.getLocalAddress()
+ " -> " + channel.getRemoteAddress();
}

private Request getRequestWithoutData() {
Request newRequest = request.copy();
newRequest.setData(null);
return newRequest;
private static Request getRequestWithoutData(Request request) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method can be removed. We can use request. copyWithoutData() directly.

return request.copyWithoutData();
}

private static class TimeoutCheckTask implements TimerTask {
Expand Down