You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/06/19 03:09:11 UTC
[servicecomb-java-chassis] branch master updated:
[SCB-2014]dependency update: upgrade vert.x from 3.8.3 to 3.8.5
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new ee706a8 [SCB-2014]dependency update: upgrade vert.x from 3.8.3 to 3.8.5
ee706a8 is described below
commit ee706a850a8768c67015ed9b1b12512eceb7c76d
Author: liubao <bi...@qq.com>
AuthorDate: Thu Jun 18 21:03:10 2020 +0800
[SCB-2014]dependency update: upgrade vert.x from 3.8.3 to 3.8.5
---
dependencies/default/pom.xml | 2 +-
.../vertx/client/http/HttpClientPoolFactory.java | 17 ++++++++++++++++-
.../rest/client/http/RestClientInvocation.java | 12 ------------
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 085dbd8..d26b80a 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -107,7 +107,7 @@
<tcnetty.version>2.0.28.Final</tcnetty.version>
<tec-zkclient.version>0.10</tec-zkclient.version>
<tomakehurst.version>2.6.0</tomakehurst.version>
- <vertx.version>3.8.3</vertx.version>
+ <vertx.version>3.8.5</vertx.version>
<xstream.version>1.4.11.1</xstream.version>
<zipkin.version>2.19.1</zipkin.version>
<zipkin-reporter.version>2.7.13</zipkin-reporter.version>
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java
index a6b1f60..685ddf8 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java
@@ -18,6 +18,8 @@
package org.apache.servicecomb.foundation.vertx.client.http;
import org.apache.servicecomb.foundation.vertx.client.ClientPoolFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import io.vertx.core.Context;
import io.vertx.core.http.HttpClient;
@@ -25,6 +27,8 @@ import io.vertx.core.http.HttpClientOptions;
// execute in vertx context
public class HttpClientPoolFactory implements ClientPoolFactory<HttpClientWithContext> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HttpClientPoolFactory.class);
+
private HttpClientOptions httpClientOptions;
public HttpClientPoolFactory(HttpClientOptions httpClientOptions) {
@@ -34,7 +38,18 @@ public class HttpClientPoolFactory implements ClientPoolFactory<HttpClientWithCo
@Override
public HttpClientWithContext createClientPool(Context context) {
HttpClient httpClient = context.owner().createHttpClient(httpClientOptions);
-
+ httpClient.connectionHandler(connection -> {
+ LOGGER.debug("http connection connected, local:{}, remote:{}.",
+ connection.localAddress(), connection.remoteAddress());
+ connection.closeHandler(v ->
+ LOGGER.debug("http connection closed, local:{}, remote:{}.",
+ connection.localAddress(), connection.remoteAddress())
+ );
+ connection.exceptionHandler(e ->
+ LOGGER.info("http connection exception, local:{}, remote:{}.",
+ connection.localAddress(), connection.remoteAddress(), e)
+ );
+ });
return new HttpClientWithContext(httpClient, context);
}
}
diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java
index 82b4648..59803ed 100644
--- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java
+++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java
@@ -118,18 +118,6 @@ public class RestClientInvocation {
getLocalAddress(), ipPort.getSocketAddress(), e);
throwableHandler.handle(e);
});
- clientRequest.connectionHandler(connection -> {
- invocation.getTraceIdLogger().debug(LOGGER, "http connection connected, local:{}, remote:{}.",
- connection.localAddress(), connection.remoteAddress());
- connection.closeHandler(v ->
- invocation.getTraceIdLogger().debug(LOGGER, "http connection closed, local:{}, remote:{}.",
- connection.localAddress(), connection.remoteAddress())
- );
- connection.exceptionHandler(e ->
- invocation.getTraceIdLogger().info(LOGGER, "http connection exception, local:{}, remote:{}.",
- connection.localAddress(), connection.remoteAddress(), e)
- );
- });
// 从业务线程转移到网络线程中去发送
invocation.getInvocationStageTrace().startSend();