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

Tidy up HttpPipelineHandler log messages. #336

Merged
merged 1 commit into from
Nov 9, 2018
Merged

Tidy up HttpPipelineHandler log messages. #336

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...nts/server/src/main/java/com/hotels/styx/server/netty/connectors/HttpPipelineHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ private State onResponseSent(ChannelHandlerContext ctx) {
statsSink.onComplete(ongoingRequest.id(), ongoingResponse.status().code());
if (ongoingRequest.keepAlive()) {
ongoingRequest = null;
ongoingResponse = null;

if (prematureRequest != null) {
eventProcessor.submit(new RequestReceivedEvent(prematureRequest, ctx));
Expand Down
41 changes: 35 additions & 6 deletions ...server/src/test/java/com/hotels/styx/server/netty/connectors/HttpPipelineHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import com.google.common.collect.ObjectArrays;
import com.hotels.styx.api.ContentOverflowException;
import com.hotels.styx.api.Eventual;
import com.hotels.styx.api.HttpResponse;
import com.hotels.styx.api.HttpHandler;
import com.hotels.styx.api.HttpInterceptor;
import com.hotels.styx.api.HttpResponse;
import com.hotels.styx.api.LiveHttpRequest;
import com.hotels.styx.api.LiveHttpResponse;
import com.hotels.styx.api.metrics.codahale.CodaHaleMetricRegistry;
Expand All @@ -44,6 +44,7 @@
import io.netty.handler.codec.http.HttpObjectAggregator;
import io.netty.handler.codec.http.HttpRequestDecoder;
import org.mockito.ArgumentCaptor;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import rx.Observable;
Expand All @@ -62,14 +63,14 @@
import static com.hotels.styx.api.HttpHeaderNames.CONNECTION;
import static com.hotels.styx.api.HttpHeaderNames.CONTENT_LENGTH;
import static com.hotels.styx.api.HttpHeaderValues.CLOSE;
import static com.hotels.styx.api.LiveHttpRequest.get;
import static com.hotels.styx.api.LiveHttpResponse.response;
import static com.hotels.styx.api.HttpResponseStatus.BAD_GATEWAY;
import static com.hotels.styx.api.HttpResponseStatus.BAD_REQUEST;
import static com.hotels.styx.api.HttpResponseStatus.INTERNAL_SERVER_ERROR;
import static com.hotels.styx.api.HttpResponseStatus.OK;
import static com.hotels.styx.api.HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE;
import static com.hotels.styx.api.HttpResponseStatus.REQUEST_TIMEOUT;
import static com.hotels.styx.api.LiveHttpRequest.get;
import static com.hotels.styx.api.LiveHttpResponse.response;
import static com.hotels.styx.server.netty.connectors.HttpPipelineHandler.State.ACCEPTING_REQUESTS;
import static com.hotels.styx.server.netty.connectors.HttpPipelineHandler.State.SENDING_RESPONSE;
import static com.hotels.styx.server.netty.connectors.HttpPipelineHandler.State.SENDING_RESPONSE_CLIENT_CLOSED;
Expand Down Expand Up @@ -97,6 +98,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertTrue;
import static rx.RxReactiveStreams.toPublisher;

public class HttpPipelineHandlerTest {
Expand Down Expand Up @@ -132,8 +134,12 @@ public Eventual<LiveHttpResponse> handle(LiveHttpRequest request, HttpIntercepto

private ResponseEnhancer responseEnhancer;

private LoggingTestSupport logger;

@BeforeMethod
public void setUp() throws Exception {
logger = new LoggingTestSupport(HttpPipelineHandler.class);

statsCollector = mock(RequestStatsCollector.class);
errorListener = mock(HttpErrorStatusListener.class);
ctx = mockCtx();
Expand Down Expand Up @@ -186,6 +192,11 @@ private void setUpFor2Requests() throws Exception {
setupHandlerTo(ACCEPTING_REQUESTS);
}

@AfterMethod
public void tearDown() {
logger.stop();
}

private HttpPipelineHandler createHandler(HttpHandler pipeline) throws Exception {
metrics = new CodaHaleMetricRegistry();
HttpPipelineHandler handler = handlerWithMocks(pipeline)
Expand Down Expand Up @@ -902,6 +913,27 @@ public void discardsOnErrorForEarlierRequestsInWaitingForResponseState() throws
assertThat(handler.state(), is(WAITING_FOR_RESPONSE));
}

@Test
public void removesOngoingResponeFromLogMessages() throws Exception {
setUpFor2Requests();

handler.channelRead0(ctx, request);
assertThat(handler.state(), is(WAITING_FOR_RESPONSE));

responseObservable.onNext(response);
assertThat(handler.state(), is(SENDING_RESPONSE));

writerFuture.complete(null);
assertThat(handler.state(), is(ACCEPTING_REQUESTS));

handler.channelRead0(ctx, request);
assertThat(handler.state(), is(WAITING_FOR_RESPONSE));

responseObservable2.onError(new RuntimeException("error"));

assertTrue(logger.lastMessage().getMessage().contains("ongoingResponse=null"));
}

private static HttpResponseWriterFactory responseWriterFactory(CompletableFuture<Void> future) {
HttpResponseWriterFactory writerFactory = mock(HttpResponseWriterFactory.class);
HttpResponseWriter responseWriter = mock(HttpResponseWriter.class);
Expand All @@ -919,7 +951,6 @@ public void cancelsOngoingRequestWhenSpuriousRequestArrivesInWaitingForResponseS
// - writes EMPTY_LAST_CONTENT and closes the channel
// - logs an error message
// - cancels the ongoing request on the HTTP pipeline
LoggingTestSupport logger = new LoggingTestSupport(HttpPipelineHandler.class);

LiveHttpRequest spurious = get("/bar").build();
setupHandlerTo(WAITING_FOR_RESPONSE);
Expand All @@ -935,8 +966,6 @@ public void cancelsOngoingRequestWhenSpuriousRequestArrivesInWaitingForResponseS

@Test
public void logsSslHandshakeErrors() throws Exception {
LoggingTestSupport logger = new LoggingTestSupport(HttpPipelineHandler.class);

setupHandlerTo(ACCEPTING_REQUESTS);

handler.exceptionCaught(ctx, new DecoderException(new SSLHandshakeException("Client requested protocol TLSv1.1 not enabled or not supported")));
Expand Down