Skip to content

fix(alarm): Listener may not load #4320

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

Merged
merged 2 commits into from
Mar 31, 2025
Merged

fix(alarm): Listener may not load #4320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d28ec6f
fix
ungreat Mar 28, 2025
90b1997
add log
ungreat Mar 31, 2025
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
19 changes: 7 additions & 12 deletions server/odc-core/src/main/java/com/oceanbase/odc/core/alarm/AlarmService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@

import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.concurrent.CopyOnWriteArrayList;

import javax.annotation.Nullable;

Expand All @@ -33,16 +31,13 @@
@Slf4j
class AlarmService {

private final List<AlarmEventListener> listeners = new ArrayList<>();
private final List<AlarmEventListener> listeners = new CopyOnWriteArrayList<>();

public AlarmService() {
ServiceLoader<AlarmEventListener> load = ServiceLoader.load(AlarmEventListener.class);
Iterator<AlarmEventListener> iterator = load.iterator();
while (iterator.hasNext()) {
AlarmEventListener next = iterator.next();
log.debug("AlarmEventListener:" + next.getClass().getName() + "have been loaded");
listeners.add(next);
}
public AlarmService() {}

public void addListener(AlarmEventListener listener) {
listeners.add(listener);
log.info("Add AlarmEventListener: {}", listener);
}

public void alarm(String eventName, Map<String, String> eventMessage) {
Expand Down
4 changes: 4 additions & 0 deletions server/odc-core/src/main/java/com/oceanbase/odc/core/alarm/AlarmUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ private AlarmUtils() {}

static AlarmService alarmService = new AlarmService();

public static void registerListener(AlarmEventListener listener) {
alarmService.addListener(listener);
}

public static void alarm(String eventName, String eventMessage) {
alarmService.alarm(eventName, eventMessage);
}
Expand Down
1 change: 0 additions & 1 deletion server/odc-server/src/main/java/com/oceanbase/odc/server/OdcServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public OdcServer(@Qualifier("metadbMigrate") AbstractMetaDBMigrate metadbMigrate
* @param args
*/
public static void main(String[] args) {
AlarmUtils.alarm(SERVER_RESTART, LocalDateTime.now().toString());
initEnv();
System.setProperty("spring.cloud.bootstrap.enabled", "true");
PluginSpringApplication.run(OdcServer.class, args);
Expand Down