[SCB-2206]ProducerOperationHandler print message null when exception … (#2278)
* [SCB-2206]ProducerOperationHandler print message null when exception is InvocationTargetException
* [SCB-2206]fix tests to avoid port conflict
diff --git a/core/src/main/java/org/apache/servicecomb/core/handler/impl/ProducerOperationHandler.java b/core/src/main/java/org/apache/servicecomb/core/handler/impl/ProducerOperationHandler.java
index ed81e4b..488a504 100644
--- a/core/src/main/java/org/apache/servicecomb/core/handler/impl/ProducerOperationHandler.java
+++ b/core/src/main/java/org/apache/servicecomb/core/handler/impl/ProducerOperationHandler.java
@@ -93,7 +93,8 @@
} catch (Throwable e) {
if (shouldPrintErrorLog(e)) {
invocation.getTraceIdLogger().error(LOGGER, "unexpected error {}, message={}",
- invocation.getInvocationQualifiedName(), e.getMessage());
+ invocation.getInvocationQualifiedName(),
+ org.apache.servicecomb.foundation.common.utils.ExceptionUtils.getExceptionMessageWithoutTrace(e));
}
invocation.onBusinessMethodFinish();
invocation.onBusinessFinish();
@@ -126,7 +127,8 @@
} catch (Throwable e) {
if (shouldPrintErrorLog(e)) {
invocation.getTraceIdLogger().error(LOGGER, "unexpected error operation={}, message={}",
- invocation.getInvocationQualifiedName(), e.getMessage());
+ invocation.getInvocationQualifiedName(),
+ org.apache.servicecomb.foundation.common.utils.ExceptionUtils.getExceptionMessageWithoutTrace(e));
}
invocation.onBusinessMethodFinish();
invocation.onBusinessFinish();
diff --git a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/Application.java b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/Application.java
index 6998697..e435308 100644
--- a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/Application.java
+++ b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/java/org/apache/servicecomb/demo/multiServiceCenterClient/Application.java
@@ -36,7 +36,7 @@
public static void main(final String[] args) throws Exception {
new SpringApplicationBuilder().sources(Application.class)
- .web(WebApplicationType.SERVLET).build().run(args);
+ .web(WebApplicationType.NONE).build().run(args);
runTest();
}
diff --git a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/resources/application.yml b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/resources/application.yml
index ebba6a0..6fbd422 100644
--- a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/resources/application.yml
+++ b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/resources/application.yml
@@ -15,9 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-server:
- port: 8084
-
# java-chassis configurations
APPLICATION_ID: demo-multi-service-center
service_description:
@@ -29,8 +26,6 @@
address: http://127.0.0.1:30100
registry-serverB:
address: http://127.0.0.1:40100
- rest:
- address: 0.0.0.0:8084
handler:
chain:
diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/java/org/apache/servicecomb/demo/zeroconfig/tests/Application.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/java/org/apache/servicecomb/demo/zeroconfig/tests/Application.java
index 5bd9920..1341ab2 100644
--- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/java/org/apache/servicecomb/demo/zeroconfig/tests/Application.java
+++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/java/org/apache/servicecomb/demo/zeroconfig/tests/Application.java
@@ -29,7 +29,7 @@
public class Application {
public static void main(final String[] args) throws Exception {
- new SpringApplicationBuilder().sources(Application.class).web(WebApplicationType.SERVLET)
+ new SpringApplicationBuilder().sources(Application.class).web(WebApplicationType.NONE)
.build().run(args);
runTest();
diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/resources/application.yml b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/resources/application.yml
index 541af06..9d610e0 100644
--- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/resources/application.yml
+++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/src/main/resources/application.yml
@@ -15,9 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-server:
- port: 8084
-
# java-chassis configurations
APPLICATION_ID: demo-zeroconfig-schemadiscovery-registry
