Skip to content

Commit

Permalink
Invoking proxyToServerConnectionFailed when proxy cannot connect to s…
Browse files Browse the repository at this point in the history
…erver
  • Loading branch information
jekh committed Jul 5, 2015
1 parent ec49ed2 commit 779e6df
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ protected boolean serverConnectionFailed(
serverConnection.getRemoteAddress(),
lastStateBeforeFailure,
cause);
currentFilters.proxyToServerConnectionFailed();
connectionFailedUnrecoverably(initialRequest);
return false;
}
Expand Down
31 changes: 31 additions & 0 deletions src/test/java/org/littleshoot/proxy/HttpFilterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,37 @@ public void proxyToServerResolutionSucceeded(String serverHostAndPort, InetSocke
assertTrue("proxyToServerResolutionFailed method was not called", resolutionFailed.get());
}

@Test
public void testConnectionFailedCalledAfterConnectionFailure() throws Exception {
final AtomicBoolean connectionFailed = new AtomicBoolean(false);
final AtomicBoolean connectionSucceeded = new AtomicBoolean(false);

HttpFiltersSource filtersSource = new HttpFiltersSourceAdapter() {
@Override
public HttpFilters filterRequest(HttpRequest originalRequest) {
return new HttpFiltersAdapter(originalRequest) {
@Override
public void proxyToServerConnectionFailed() {
connectionFailed.set(true);
}

@Override
public void proxyToServerConnectionSucceeded() {
connectionSucceeded.set(true);
}
};
}
};

setUpHttpProxyServer(filtersSource);

// port 0 is not connectable
getResponse("http://localhost:0/some-resource");

assertFalse("proxyToServerConnectionSucceeded method was called but should not have been", connectionSucceeded.get());
assertTrue("proxyToServerConnectionFailed method was not called", connectionFailed.get());
}

@Test
public void testRequestSentInvokedAfterLastHttpContentSent() throws Exception {
final AtomicBoolean lastHttpContentProcessed = new AtomicBoolean(false);
Expand Down

0 comments on commit 779e6df

Please sign in to comment.