This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch 6778-if-kafka-is-turned-on-internal-subs-dont-work in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 8942f9ddeb39f1ded9426f1c08c5d9877853ad66 Author: Daan Hoogland <[email protected]> AuthorDate: Mon Sep 25 14:09:00 2023 +0200 cleanup --- server/src/main/java/com/cloud/api/ApiServer.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/server/src/main/java/com/cloud/api/ApiServer.java b/server/src/main/java/com/cloud/api/ApiServer.java index 490e6a8512e..e2c6ea5f8cf 100644 --- a/server/src/main/java/com/cloud/api/ApiServer.java +++ b/server/src/main/java/com/cloud/api/ApiServer.java @@ -95,8 +95,6 @@ import org.apache.cloudstack.config.ApiServiceConfiguration; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; -import org.apache.cloudstack.framework.events.EventBus; -import org.apache.cloudstack.framework.events.EventBusException; import org.apache.cloudstack.framework.events.EventDistributor; import org.apache.cloudstack.framework.jobs.AsyncJob; import org.apache.cloudstack.framework.jobs.AsyncJobManager; @@ -135,7 +133,6 @@ import org.apache.http.protocol.ResponseDate; import org.apache.http.protocol.ResponseServer; import org.apache.log4j.Logger; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.stereotype.Component; import com.cloud.api.dispatch.DispatchChainFactory; @@ -306,13 +303,6 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer if (s_logger.isTraceEnabled()) s_logger.trace("Handle asyjob publish event " + jobEvent); - EventBus eventBus = null; - try { - eventBus = ComponentContext.getComponent(EventBus.class); - } catch (NoSuchBeanDefinitionException nbe) { - return; // no provider is configured to provide events bus, so just return - } - if (!job.getDispatcher().equalsIgnoreCase("ApiAsyncJobDispatcher")) { return; } @@ -372,13 +362,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer eventDescription.put("domainname", domain.getName()); } event.setDescription(eventDescription); - - try { - eventDistributor.publish(event); - } catch (EventBusException evx) { - String errMsg = "Failed to publish async job event on the event bus."; - s_logger.warn(errMsg, evx); - } + eventDistributor.publish(event); } @Override
