You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/05/18 06:06:56 UTC
[incubator-servicecomb-java-chassis] 11/13: SCB-548 fix pr comment
and update coverage pom
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 6852fe797056aa8d5a3c355797a3cf9eeceb7668
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Thu May 17 14:21:21 2018 +0800
SCB-548 fix pr comment and update coverage pom
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../org/apache/servicecomb/core/SCBEngine.java | 21 ++++++--------
coverage-reports/pom.xml | 32 ++++++++++++++++++++++
2 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
index 772070c..17a4fce 100644
--- a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
+++ b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
@@ -225,17 +225,13 @@ public class SCBEngine {
public synchronized void uninit() {
if (SCBStatus.UP.equals(status)) {
LOGGER.info("ServiceComb is closing now...");
- try {
- doUninit();
- status = SCBStatus.DOWN;
- } catch (Exception e) {
- status = SCBStatus.FAILED;
- LOGGER.info("ServiceComb failed shutdown", e);
- }
+ doUninit();
+ status = SCBStatus.DOWN;
+ LOGGER.info("ServiceComb had closed");
}
}
- private void doUninit() throws Exception {
+ private void doUninit() {
//Step 1: notify all component stop invoke via BEFORE_CLOSE Event
safeTriggerEvent(EventType.BEFORE_CLOSE);
@@ -248,7 +244,11 @@ public class SCBEngine {
//Step 3: wait all invocation finished
// forbit create new consumer invocation
- validAllInvocationFinished();
+ try {
+ validAllInvocationFinished();
+ } catch (InterruptedException e) {
+ LOGGER.error("wait all invocation finished interrupted", e);
+ }
//Step 4: Stop vertx to prevent blocking exit
VertxUtils.blockCloseVertxByName("config-center");
@@ -256,9 +256,6 @@ public class SCBEngine {
//Step 5: notify all component do clean works via AFTER_CLOSE Event
safeTriggerEvent(EventType.AFTER_CLOSE);
-
- //Step 6: Clean flags for re-init
- eventBus.unregister(this);
}
private void validAllInvocationFinished() throws InterruptedException {
diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml
index 337ae26..fcdb3e0 100644
--- a/coverage-reports/pom.xml
+++ b/coverage-reports/pom.xml
@@ -52,6 +52,10 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
<artifactId>java-chassis-core</artifactId>
</dependency>
<dependency>
@@ -175,6 +179,14 @@
<artifactId>config-apollo</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>config-cc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>edge-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>pojo-client</artifactId>
<version>1.0.0-m2-SNAPSHOT</version>
@@ -261,6 +273,26 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>springmvc-tests-general</artifactId>
+ <version>1.0.0-m2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>springmvc-tests-general-with-springboot</artifactId>
+ <version>1.0.0-m2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>springmvc-tests-simplified-mapping</artifactId>
+ <version>1.0.0-m2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>springmvc-tests-simplified-mapping-with-springboot</artifactId>
+ <version>1.0.0-m2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
<artifactId>tracing-tests</artifactId>
<version>1.0.0-m2-SNAPSHOT</version>
</dependency>
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.