You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/06/08 04:49:01 UTC
[dubbo] branch 3.2 updated: Publish Module deployer state event (#12477)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new f35ac09353 Publish Module deployer state event (#12477)
f35ac09353 is described below
commit f35ac093539a1e49dd371bab5b8c6b38dc214cac
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Thu Jun 8 12:48:55 2023 +0800
Publish Module deployer state event (#12477)
Co-authored-by: songxiaosheng <so...@elastic.link>
---
.../context/DubboDeployApplicationListener.java | 61 +++++++++++++++++-----
.../context/event/DubboModuleStateEvent.java | 55 +++++++++++++++++++
2 files changed, 104 insertions(+), 12 deletions(-)
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboDeployApplicationListener.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboDeployApplicationListener.java
index 37c2343604..72cfa1b387 100644
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboDeployApplicationListener.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboDeployApplicationListener.java
@@ -16,11 +16,6 @@
*/
package org.apache.dubbo.config.spring.context;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_STOP_DUBBO_ERROR;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_START_MODEL;
-import static org.springframework.util.ObjectUtils.nullSafeEquals;
-
-import java.util.concurrent.Future;
import org.apache.dubbo.common.deploy.DeployListenerAdapter;
import org.apache.dubbo.common.deploy.DeployState;
import org.apache.dubbo.common.deploy.ModuleDeployer;
@@ -28,10 +23,12 @@ import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.config.spring.context.event.DubboApplicationStateEvent;
+import org.apache.dubbo.config.spring.context.event.DubboModuleStateEvent;
import org.apache.dubbo.config.spring.util.DubboBeanUtils;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ModelConstants;
import org.apache.dubbo.rpc.model.ModuleModel;
+
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -41,6 +38,12 @@ import org.springframework.context.event.ContextClosedEvent;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.Ordered;
+import java.util.concurrent.Future;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_START_MODEL;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_STOP_DUBBO_ERROR;
+import static org.springframework.util.ObjectUtils.nullSafeEquals;
+
/**
* An ApplicationListener to control Dubbo application.
*/
@@ -62,39 +65,73 @@ public class DubboDeployApplicationListener implements ApplicationListener<Appli
applicationModel.getDeployer().addDeployListener(new DeployListenerAdapter<ApplicationModel>(){
@Override
public void onStarting(ApplicationModel scopeModel) {
- publishEvent(DeployState.STARTING);
+ publishApplicationEvent(DeployState.STARTING);
}
@Override
public void onStarted(ApplicationModel scopeModel) {
- publishEvent(DeployState.STARTED);
+ publishApplicationEvent(DeployState.STARTED);
}
@Override
public void onStopping(ApplicationModel scopeModel) {
- publishEvent(DeployState.STOPPING);
+ publishApplicationEvent(DeployState.STOPPING);
}
@Override
public void onStopped(ApplicationModel scopeModel) {
- publishEvent(DeployState.STOPPED);
+ publishApplicationEvent(DeployState.STOPPED);
}
@Override
public void onFailure(ApplicationModel scopeModel, Throwable cause) {
- publishEvent(DeployState.FAILED, cause);
+ publishApplicationEvent(DeployState.FAILED, cause);
+ }
+ });
+ moduleModel.getDeployer().addDeployListener(new DeployListenerAdapter<ModuleModel>(){
+ @Override
+ public void onStarting(ModuleModel scopeModel) {
+ publishModuleEvent(DeployState.STARTING);
+ }
+
+ @Override
+ public void onStarted(ModuleModel scopeModel) {
+ publishModuleEvent(DeployState.STARTED);
+ }
+
+ @Override
+ public void onStopping(ModuleModel scopeModel) {
+ publishModuleEvent(DeployState.STOPPING);
+ }
+
+ @Override
+ public void onStopped(ModuleModel scopeModel) {
+ publishModuleEvent(DeployState.STOPPED);
+ }
+
+ @Override
+ public void onFailure(ModuleModel scopeModel, Throwable cause) {
+ publishModuleEvent(DeployState.FAILED, cause);
}
});
}
- private void publishEvent(DeployState state) {
+ private void publishApplicationEvent(DeployState state) {
applicationContext.publishEvent(new DubboApplicationStateEvent(applicationModel, state));
}
- private void publishEvent(DeployState state, Throwable cause) {
+ private void publishApplicationEvent(DeployState state, Throwable cause) {
applicationContext.publishEvent(new DubboApplicationStateEvent(applicationModel, state, cause));
}
+ private void publishModuleEvent(DeployState state) {
+ applicationContext.publishEvent(new DubboModuleStateEvent(moduleModel, state));
+ }
+
+ private void publishModuleEvent(DeployState state, Throwable cause) {
+ applicationContext.publishEvent(new DubboModuleStateEvent(moduleModel, state, cause));
+ }
+
@Override
public void onApplicationEvent(ApplicationContextEvent event) {
if (nullSafeEquals(applicationContext, event.getSource())) {
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/event/DubboModuleStateEvent.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/event/DubboModuleStateEvent.java
new file mode 100644
index 0000000000..81b59aa14e
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/event/DubboModuleStateEvent.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.config.spring.context.event;
+
+import org.apache.dubbo.common.deploy.DeployState;
+import org.apache.dubbo.rpc.model.ModuleModel;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * Dubbo's module state event on starting/started/stopping/stopped
+ */
+public class DubboModuleStateEvent extends ApplicationEvent {
+
+ private final DeployState state;
+
+ private Throwable cause;
+
+ public DubboModuleStateEvent(ModuleModel applicationModel, DeployState state) {
+ super(applicationModel);
+ this.state = state;
+ }
+
+ public DubboModuleStateEvent(ModuleModel applicationModel, DeployState state, Throwable cause) {
+ super(applicationModel);
+ this.state = state;
+ this.cause = cause;
+ }
+
+ public ModuleModel getModule() {
+ return (ModuleModel) getSource();
+ }
+
+ public DeployState getState() {
+ return state;
+ }
+
+ public Throwable getCause() {
+ return cause;
+ }
+}