File tree 3 files changed +11
-3
lines changed
main/java/org/asynchttpclient/providers/netty
test/java/org/asynchttpclient/providers/netty 3 files changed +11
-3
lines changed Original file line number Diff line number Diff line change 34
34
import io .netty .handler .codec .http .HttpHeaders ;
35
35
import io .netty .handler .codec .http .HttpResponse ;
36
36
37
+ import java .net .SocketAddress ;
37
38
import java .net .URI ;
38
39
import java .util .concurrent .CancellationException ;
39
40
import java .util .concurrent .CountDownLatch ;
@@ -468,6 +469,10 @@ public boolean canRetry() {
468
469
return true ;
469
470
}
470
471
472
+ public SocketAddress getChannelRemoteAddress () {
473
+ return channel () != null ? channel ().remoteAddress (): null ;
474
+ }
475
+
471
476
public void setRequest (Request request ) {
472
477
this .request = request ;
473
478
}
Original file line number Diff line number Diff line change @@ -45,8 +45,9 @@ public void run(Timeout timeout) throws Exception {
45
45
}
46
46
47
47
if (!nettyResponseFuture .isDone () && !nettyResponseFuture .isCancelled ()) {
48
- expire ("Request timeout of " + nettyResponseFuture .getRequestTimeoutInMs () + " ms" ,
49
- millisTime () - nettyResponseFuture .getStart ());
48
+ long age = millisTime () - nettyResponseFuture .getStart ();
49
+ expire ("Request timed out to " + nettyResponseFuture .getChannelRemoteAddress () + " of "
50
+ + nettyResponseFuture .getRequestTimeoutInMs () + " ms after " + age + " ms" , age );
50
51
nettyResponseFuture .setRequestTimeoutReached ();
51
52
}
52
53
}
Original file line number Diff line number Diff line change @@ -22,7 +22,9 @@ public class NettyPerRequestTimeoutTest extends PerRequestTimeoutTest {
22
22
23
23
@ Override
24
24
protected void checkTimeoutMessage (String message ) {
25
- assertTrue (message .equals ("Request timeout of 100 ms" ));
25
+ assertTrue (message .startsWith ("Request timed out" ), "error message indicates reason of error" );
26
+ assertTrue (message .contains ("127.0.0.1" ), "error message contains remote ip address" );
27
+ assertTrue (message .contains ("of 100 ms" ), "error message contains timeout configuration value" );
26
28
}
27
29
28
30
@ Override
You can’t perform that action at this time.
0 commit comments