[GitHub] liubao68 closed pull request #1055: [SCB-1108]when timeout, the access log status is 200

[GitBox <gi...@apache.org>]

liubao68 closed pull request #1055: [SCB-1108]when timeout, the access log status is 200
URL: https://github.com/apache/servicecomb-java-chassis/pull/1055
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItem.java b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItem.java
index 17f589b6c..69b10a44c 100644
--- a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItem.java
+++ b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItem.java
@@ -19,11 +19,14 @@
 
 import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
 import org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
 
 public class HttpStatusItem implements AccessLogItem<RoutingContext> {
+  private static Logger LOGGER = LoggerFactory.getLogger(HttpStatusItem.class);
 
   public static final String EMPTY_RESULT = "-";
 
@@ -33,7 +36,12 @@ public String getFormattedItem(AccessLogParam<RoutingContext> accessLogParam) {
     if (null == response) {
       return EMPTY_RESULT;
     }
-
+    if (response.closed() && !response.ended()) {
+      LOGGER.warn(
+          "Response is closed before sending any data. "
+              + "Please check idle connection timeout for provider is properly configured.");
+      return EMPTY_RESULT;
+    }
     return String.valueOf(response.getStatusCode());
   }
 }
diff --git a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusItemTest.java b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItemTest.java
similarity index 85%
rename from transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusItemTest.java
rename to transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItemTest.java
index 19197a3f6..2ab6aef93 100644
--- a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusItemTest.java
+++ b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItemTest.java
@@ -26,7 +26,7 @@
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
 
-public class StatusItemTest {
+public class HttpStatusItemTest {
 
   private static final HttpStatusItem STATUS_ELEMENT = new HttpStatusItem();
 
@@ -51,6 +51,7 @@ public void getFormattedElement() {
   public void getFormattedElementOnResponseIsNull() {
     AccessLogParam<RoutingContext> param = new AccessLogParam<>();
     RoutingContext context = Mockito.mock(RoutingContext.class);
+    HttpServerResponse response = Mockito.mock(HttpServerResponse.class);
 
     param.setContextData(context);
     Mockito.when(context.response()).thenReturn(null);
@@ -58,5 +59,12 @@ public void getFormattedElementOnResponseIsNull() {
     String result = STATUS_ELEMENT.getFormattedItem(param);
 
     assertEquals("-", result);
+
+    Mockito.when(context.response()).thenReturn(response);
+    Mockito.when(response.closed()).thenReturn(true);
+    Mockito.when(response.ended()).thenReturn(false);
+    result = STATUS_ELEMENT.getFormattedItem(param);
+
+    assertEquals("-", result);
   }
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services