djb-eapim/elink-online-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

난수 생성 문제로 풀링 제거 원복 및 큐 사용 비동기처리.

Browse Source
This commit is contained in:
cho
2026-03-05 14:48:37 +09:00
parent 7ac995e5ef
commit 4f5fa96ef5
2 changed files with 140 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/eai/custom/alarm/AlarmStateManager.java
+90 -89
View File
@@ -18,6 +18,7 @@ import com.eactive.eai.custom.alarm.event.AlarmEvent;
import com.eactive.eai.custom.alarm.key.AlarmKey; import com.eactive.eai.custom.alarm.key.AlarmKey;
import com.eactive.eai.custom.alarm.policy.AlarmPolicy; import com.eactive.eai.custom.alarm.policy.AlarmPolicy;
import com.eactive.eai.custom.alarm.policy.SendPolicy; import com.eactive.eai.custom.alarm.policy.SendPolicy;
import com.eactive.eai.custom.alarm.ums.UmsSendManager;
import com.eactive.eai.custom.alarm.ums.UmsService; import com.eactive.eai.custom.alarm.ums.UmsService;
import com.eactive.eai.custom.alarm.ums.payload.ObpMonitoringUmsTemplate; import com.eactive.eai.custom.alarm.ums.payload.ObpMonitoringUmsTemplate;
import com.eactive.eai.custom.alarm.ums.payload.UmsRequestPayload; import com.eactive.eai.custom.alarm.ums.payload.UmsRequestPayload;
@@ -25,121 +26,121 @@ import com.eactive.eai.custom.alarm.ums.payload.UmsRequestPayload;
@Component @Component
public class AlarmStateManager { public class AlarmStateManager {
List<AlarmEvent> registerAlarmList = new ArrayList<AlarmEvent>(); List<AlarmEvent> registerAlarmList = new ArrayList<AlarmEvent>();
private final ScheduledExecutorService scheduler; private final ScheduledExecutorService scheduler;
protected static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT); protected static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
private static AlarmStateManager alarmStateManager; private static AlarmStateManager alarmStateManager;
@Autowired @Autowired
AlarmService alarmService; AlarmService alarmService;
@Autowired @Autowired
UmsService usmService; UmsSendManager umsSendManager;
public static AlarmStateManager getAlarmStateManager() { public static AlarmStateManager getAlarmStateManager() {
if (alarmStateManager == null) { if (alarmStateManager == null) {
alarmStateManager = ApplicationContextProvider.getContext().getBean(AlarmStateManager.class); alarmStateManager = ApplicationContextProvider.getContext().getBean(AlarmStateManager.class);
} }
return alarmStateManager; return alarmStateManager;
}
public AlarmStateManager() {
this.scheduler = Executors.newSingleThreadScheduledExecutor(r -> {
Thread t = new Thread(r);
t.setName("AlarmStateManager-worker");
t.setDaemon(false);
return t;
});
scheduler.scheduleWithFixedDelay(() -> {
try {
// === 여기에 지속 실행할 로직 ===
fireAlarm();
} catch (Throwable e) {
// 반드시 예외 잡기 (안 잡으면 스케줄 자체가 죽음)
logger.error("fireAlarm fail", e);
}
}, 0, 5, TimeUnit.SECONDS); // 최초 0초, 이후 5초 간격
}
public void onEvnet(AlarmEvent alaramEvent) {
Optional<AlarmEvent> existEvent = registerAlarmList.stream().filter(e -> e.equals(alaramEvent)).findFirst();
if (existEvent.isPresent()) {
AlarmEvent event = existEvent.get();
event.onOcurr();
} else {
registerAlarmList.add(alaramEvent);
} }
} public AlarmStateManager() {
private void fireAlarm() { this.scheduler = Executors.newSingleThreadScheduledExecutor(r -> {
Thread t = new Thread(r);
t.setName("AlarmStateManager-worker");
t.setDaemon(false);
return t;
});
Map<AlarmKey, AlarmPolicy> alarmPolicyMap = alarmService.getAlarmPolicy(); scheduler.scheduleWithFixedDelay(() -> {
Map<AlarmKey, SendPolicy> sendPolicyMap = alarmService.getSendPolicy(); try {
// === 여기에 지속 실행할 로직 ===
fireAlarm();
Iterator<AlarmEvent> iterator = registerAlarmList.iterator(); } catch (Throwable e) {
// 반드시 예외 잡기 (안 잡으면 스케줄 자체가 죽음)
logger.error("fireAlarm fail", e);
}
while (iterator.hasNext()) { }, 0, 5, TimeUnit.SECONDS); // 최초 0초, 이후 5초 간격
AlarmEvent event = iterator.next(); }
AlarmPolicy alarmPolicy = alarmPolicyMap.get(event.getKey());
if (alarmPolicy != null && alarmPolicy.isAlarmTriggered(event)) { public void onEvnet(AlarmEvent alaramEvent) {
// 알람 발송 로직
SendPolicy sendPolicy = sendPolicyMap.get(event.getKey()); Optional<AlarmEvent> existEvent = registerAlarmList.stream().filter(e -> e.equals(alaramEvent)).findFirst();
if (alarmService.isAlarmEnabled()) {
send(sendPolicy, event); if (existEvent.isPresent()) {
AlarmEvent event = existEvent.get();
event.onOcurr();
} else { } else {
logger.info("Alarm is disabled, event = {}, policy = {}", event, sendPolicy); registerAlarmList.add(alaramEvent);
} }
// 리스트에서 안전하게 제거
iterator.remove();
}else { //트리거 조건이 안되더라도, 이벤트발생한지 오래 되었으면 제거하여 OOM 예방.
long firstOcurredAt = event.getCondition().getOcurredAt();
long diffInMs = System.currentTimeMillis() - firstOcurredAt;
if ( diffInMs >= TimeUnit.MINUTES.toMillis(60) ) { //1시간 지난거면 삭제
iterator.remove();
}
}
} }
} private void fireAlarm() {
private void send(SendPolicy sendPolicy, AlarmEvent event) { Map<AlarmKey, AlarmPolicy> alarmPolicyMap = alarmService.getAlarmPolicy();
UmsRequestPayload payload = null; Map<AlarmKey, SendPolicy> sendPolicyMap = alarmService.getSendPolicy();
try { Iterator<AlarmEvent> iterator = registerAlarmList.iterator();
List<String> cellPhoneList = sendPolicy.getCellPhoneList(); while (iterator.hasNext()) {
AlarmEvent event = iterator.next();
AlarmPolicy alarmPolicy = alarmPolicyMap.get(event.getKey());
for (String cellPhone : cellPhoneList) { if (alarmPolicy != null && alarmPolicy.isAlarmTriggered(event)) {
// 알람 발송 로직
SendPolicy sendPolicy = sendPolicyMap.get(event.getKey());
if (alarmService.isAlarmEnabled()) {
send(sendPolicy, event);
} else {
logger.info("Alarm is disabled, event = {}, policy = {}", event, sendPolicy);
}
// 리스트에서 안전하게 제거
iterator.remove();
} else { // 트리거 조건이 안되더라도, 이벤트발생한지 오래 되었으면 제거하여 OOM 예방.
payload = UmsRequestPayload.builder() long firstOcurredAt = event.getCondition().getOcurredAt();
.content(ObpMonitoringUmsTemplate.builder().message(event.getMessage()).build())
.cellphone(cellPhone).build();
logger.info("Alarm is disabled, UmsRequestPayload = {}", payload);
usmService.send(payload);
}
} catch (Exception e) { long diffInMs = System.currentTimeMillis() - firstOcurredAt;
logger.error(String.format("Alarm message delivery failed (UMS), payload=%s", payload), e);
if (diffInMs >= TimeUnit.MINUTES.toMillis(60)) { // 1시간 지난거면 삭제
iterator.remove();
}
}
}
} }
}
private void send(SendPolicy sendPolicy, AlarmEvent event) {
UmsRequestPayload payload = null;
try {
List<String> cellPhoneList = sendPolicy.getCellPhoneList();
for (String cellPhone : cellPhoneList) {
payload = UmsRequestPayload.builder()
.content(ObpMonitoringUmsTemplate.builder().message(event.getMessage()).build())
.cellphone(cellPhone).build();
logger.info("Alarm is disabled, UmsRequestPayload = {}", payload);
umsSendManager.enqueue(payload);
}
} catch (Exception e) {
logger.error(String.format("Alarm message delivery failed (UMS), payload=%s", payload), e);
}
}
} }
src/main/java/com/eactive/eai/custom/alarm/ums/UmsSendManager.java
+50 -37
View File
@@ -3,10 +3,13 @@ package com.eactive.eai.custom.alarm.ums;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.annotation.PreDestroy;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -15,59 +18,69 @@ import com.eactive.eai.custom.alarm.ums.payload.UmsRequestPayload;
@Component @Component
public class UmsSendManager { public class UmsSendManager {
protected static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
// 1. I/O 처리를 위한 전용 스레드 풀 (예: 최대 10개 스레드)
private final ExecutorService ioExecutor = Executors.newFixedThreadPool(10);
private final ScheduledExecutorService scheduler; private final ScheduledExecutorService scheduler;
protected static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
Queue<UmsRequestPayload> queue = new ConcurrentLinkedQueue<UmsRequestPayload>(); // 2. 메모리 보호를 위해 크기 제한이 있는 큐 권장 (선택사항)
private final Queue<UmsRequestPayload> queue = new ConcurrentLinkedQueue<>();
@Autowired @Autowired
UmsService umsService; UmsService umsService;
public UmsSendManager() { public UmsSendManager() {
this.scheduler = Executors.newSingleThreadScheduledExecutor(r -> { this.scheduler = Executors.newSingleThreadScheduledExecutor(r -> {
Thread t = new Thread(r); Thread t = new Thread(r);
t.setName("AlarmStateManager-worker"); t.setName("UmsSendManager-worker");
t.setDaemon(false); return t;
return t; });
});
scheduler.scheduleWithFixedDelay(() -> { scheduler.scheduleWithFixedDelay(() -> {
try {
try { sendMessage();
// === 여기에 지속 실행할 로직 === } catch (Throwable e) {
sendMessage(); logger.error("UMS 스케줄러 실행 중 오류", e);
}
} catch (Throwable e) { }, 0, 30, TimeUnit.SECONDS);
// 반드시 예외 잡기 (안 잡으면 스케줄 자체가 죽음)
logger.error("fireAlarm fail", e);
}
}, 0, 5, TimeUnit.SECONDS); // 최초 0초, 이후 5초 간격
} }
void sendMessage() throws Exception { void sendMessage() {
UmsRequestPayload payload; UmsRequestPayload payload;
while ((payload = queue.poll()) != null) { // 3. 한 번의 주기당 최대 처리량 제한 (필요시)
int count = 0;
while ((payload = queue.poll()) != null && count < 1000) {
final UmsRequestPayload finalPayload = payload; final UmsRequestPayload finalPayload = payload;
// 전용 Executor를 사용하여 공용 풀 보호
CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
UmsCallResult result = null;
try { try {
result = umsService.send(finalPayload); umsService.send(finalPayload);
} catch (Exception e) { } catch (Exception e) {
logger.error("UMS 전송 실패", e); logger.error("UMS 전송 실패", e);
}finally {
logger.info(result);
} }
}); }, ioExecutor);
count++;
} }
} }
// 4. 안전한 종료 처리
@PreDestroy
public void stop() {
scheduler.shutdown();
ioExecutor.shutdown();
try {
if (!ioExecutor.awaitTermination(60, TimeUnit.SECONDS)) {
ioExecutor.shutdownNow();
}
} catch (InterruptedException e) {
ioExecutor.shutdownNow();
logger.error("UmsSendManager shutdownNow.", e);
}
}
public void enqueue(UmsRequestPayload payload) { public void enqueue(UmsRequestPayload payload) {
queue.offer(payload); queue.offer(payload);
} }
} }