Skip to content

use ConfigKeys for event bus settings #14471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaanHoogland wants to merge 1 commit into
base: ghi10752-config-foundation
Choose a base branch
from
+11 −30
Open

use ConfigKeys for event bus settings #14471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions engine/components-api/src/main/java/com/cloud/event/UsageEventUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import com.cloud.network.Network;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.apache.cloudstack.framework.config.ConfigKey;

import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.events.Event;
import org.apache.cloudstack.framework.events.EventBus;
import org.apache.cloudstack.framework.events.EventDistributor;
Expand All @@ -50,17 +50,19 @@ public class UsageEventUtils {
private static DataCenterDao s_dcDao;
protected static Logger LOGGER = LogManager.getLogger(UsageEventUtils.class);
protected static EventBus s_eventBus = null;
protected static ConfigurationDao s_configDao;
private static EventDistributor eventDistributor;

// Registered/owned by com.cloud.server.ManagementServer#PublishUsageEvent; declared here too so this
// module can read it without a reverse dependency on the server module.
private static final ConfigKey<Boolean> PublishUsageEvent = new ConfigKey<>("Advanced", Boolean.class, "publish.usage.events", "true",
"enable or disable publishing of usage events on the event bus", true);

@Inject
UsageEventDao usageEventDao;
@Inject
AccountDao accountDao;
@Inject
DataCenterDao dcDao;
@Inject
ConfigurationDao configDao;

public UsageEventUtils() {
}
Expand All @@ -70,7 +72,6 @@ void init() {
s_usageEventDao = usageEventDao;
s_accountDao = accountDao;
s_dcDao = dcDao;
s_configDao = configDao;
}

public static void publishUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId,
Expand Down Expand Up @@ -215,9 +216,7 @@ public static void saveUsageEvent(String usageType, long accountId, long zoneId,
}

private static void publishUsageEvent(String usageEventType, Long accountId, Long zoneId, String resourceType, String resourceUUID) {
String configKey = "publish.usage.events";
String value = s_configDao.getValue(configKey);
boolean configValue = Boolean.parseBoolean(value);
boolean configValue = PublishUsageEvent.value();
if( !configValue)
return;
try {
Expand Down
11 changes: 2 additions & 9 deletions server/src/main/java/com/cloud/event/ActionEventUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,17 @@
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.events.EventDistributor;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;

import com.cloud.configuration.Config;
import com.cloud.event.dao.EventDao;
import com.cloud.projects.Project;
import com.cloud.projects.dao.ProjectDao;
import com.cloud.server.ManagementServer;
import com.cloud.server.ManagementService;
import com.cloud.user.Account;
import com.cloud.user.AccountVO;
Expand All @@ -65,7 +64,6 @@ public class ActionEventUtils {
protected static UserDao s_userDao;
private static EventDistributor eventDistributor;
protected static EntityManager s_entityMgr;
protected static ConfigurationDao s_configDao;

public static final String EventDetails = "event_details";
public static final String EventId = "event_id";
Expand All @@ -83,8 +81,6 @@ public class ActionEventUtils {
ProjectDao projectDao;
@Inject
EntityManager entityMgr;
@Inject
ConfigurationDao configDao;

public ActionEventUtils() {
}
Expand All @@ -96,7 +92,6 @@ void init() {
s_userDao = userDao;
s_projectDao = projectDao;
s_entityMgr = entityMgr;
s_configDao = configDao;
}

public static Long onActionEvent(Long userId, Long accountId, Long domainId, String type, String description, Long resourceId, String resourceType) {
Expand Down Expand Up @@ -208,9 +203,7 @@ private static Event persistActionEvent(Long userId, Long accountId, Long domain
private static void publishOnEventBus(Event eventRecord, long userId, long accountId, Long domainId,
String eventCategory, String eventType, Event.State state, String description, String resourceUuid,
String resourceType) {
String configKey = Config.PublishActionEvent.key();
String value = s_configDao.getValue(configKey);
boolean configValue = Boolean.parseBoolean(value);
boolean configValue = ManagementServer.PublishActionEvent.value();
if(!configValue)
return;

Expand Down
11 changes: 2 additions & 9 deletions server/src/main/java/com/cloud/event/AlertGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,17 @@
import javax.annotation.PostConstruct;
import javax.inject.Inject;

import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.events.EventDistributor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.stereotype.Component;

import com.cloud.configuration.Config;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
import com.cloud.server.ManagementServer;
import com.cloud.server.ManagementService;
import com.cloud.utils.component.ComponentContext;

Expand All @@ -46,15 +45,12 @@ public class AlertGenerator {
protected static Logger LOGGER = LogManager.getLogger(AlertGenerator.class);
private static DataCenterDao s_dcDao;
private static HostPodDao s_podDao;
protected static ConfigurationDao s_configDao;
protected static EventDistributor eventDistributor;

@Inject
DataCenterDao dcDao;
@Inject
HostPodDao podDao;
@Inject
ConfigurationDao configDao;

public AlertGenerator() {
}
Expand All @@ -63,13 +59,10 @@ public AlertGenerator() {
void init() {
s_dcDao = dcDao;
s_podDao = podDao;
s_configDao = configDao;
}

public static void publishAlertOnEventBus(String alertType, long dataCenterId, Long podId, String subject, String body) {
String configKey = Config.PublishAlertEvent.key();
String value = s_configDao.getValue(configKey);
boolean configValue = Boolean.parseBoolean(value);
boolean configValue = ManagementServer.PublishAlertEvent.value();
if (!configValue) {
return;
}
Expand Down
2 changes: 0 additions & 2 deletions server/src/test/java/com/cloud/event/ActionEventInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package com.cloud.event;

import com.cloud.configuration.Config;
import com.cloud.event.dao.EventDao;
import com.cloud.projects.dao.ProjectDao;
import com.cloud.user.Account;
Expand Down Expand Up @@ -150,7 +149,6 @@ public void setup() throws Exception {
*/
public void setupCommonMocks() throws Exception {
//Some basic mocks.
Mockito.when(configDao.getValue(Config.PublishActionEvent.key())).thenReturn("true");
componentContextMocked = Mockito.mockStatic(ComponentContext.class);
Mockito.when(ComponentContext.getComponent(EventBus.class)).thenReturn(eventBus);
persistedEvents = new ArrayList<>();
Expand Down
2 changes: 0 additions & 2 deletions server/src/test/java/com/cloud/event/ActionEventUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;

import com.cloud.configuration.Config;
import com.cloud.event.dao.EventDao;
import com.cloud.network.IpAddress;
import com.cloud.projects.dao.ProjectDao;
Expand Down Expand Up @@ -148,7 +147,6 @@ public void setup() throws Exception {
*/
public void setupCommonMocks() throws Exception {
//Some basic mocks.
Mockito.when(configDao.getValue(Config.PublishActionEvent.key())).thenReturn("true");
componentContextMocked = Mockito.mockStatic(ComponentContext.class);
componentContextMocked.when(() -> ComponentContext.getComponent(EventDistributor.class)).thenReturn(eventDistributor);

Expand Down
Loading