- 메모리 리로드 비정상 동작하는 부분 수정, 기존 코드 사용.
This commit is contained in:
@@ -248,7 +248,7 @@ public class AdapterController extends OnlBaseAnnotationController {
|
|||||||
synchronized (obj) {
|
synchronized (obj) {
|
||||||
service.update(adapterGroupUI);
|
service.update(adapterGroupUI);
|
||||||
|
|
||||||
Map<String, String> resultMap = service.reloadSyncStdMsgAndAdapter(adapterGroupUI.getAdptrbzwkgroupname());
|
Map<String, String> resultMap = service.reloadSyncStdMsgAndAdapter(adapterGroupUI);
|
||||||
return ResponseEntity.ok(resultMap);
|
return ResponseEntity.ok(resultMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+43
-31
@@ -540,40 +540,52 @@ public class AdapterManService extends OnlBaseService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<String, String> reloadSyncStdMsgAndAdapter(String adapterGroupName) throws Exception {
|
public Map<String, String> reloadSyncStdMsgAndAdapter(AdapterGroupUI adapterGroupUI) throws Exception {
|
||||||
|
Map<String, Object> receive = null;
|
||||||
Map<String, String> result = new HashMap<>();
|
Map<String, String> result = new HashMap<>();
|
||||||
|
String status = "success";
|
||||||
String status = "success";
|
|
||||||
|
try {
|
||||||
try {
|
log.info(">>>>>> [Reload AdapterManService Start] 리로드 시작");
|
||||||
log.debug(">>>>>>>> [Reload Start] 어댑터 그룹명 {}", adapterGroupName);
|
|
||||||
|
for (Entry<String, AdapterUI> entry : adapterGroupUI.getAdapterData().entrySet()) {
|
||||||
CommonCommand pcommand = new CommonCommand(
|
AdapterUI adapterUI = entry.getValue();
|
||||||
"com.eactive.eai.agent.adapter.ReloadAdapterPropGroupCommand",
|
String prptyGroupName = adapterUI.getPrptygroupname();
|
||||||
adapterGroupName
|
|
||||||
);
|
CommonCommand pcommand = new CommonCommand(
|
||||||
agentUtilService.broadcast(pcommand);
|
"com.eactive.eai.agent.adapter.ReloadAdapterPropGroupCommand",
|
||||||
|
prptyGroupName
|
||||||
CommonCommand acommand = new CommonCommand(
|
);
|
||||||
"com.eactive.eai.agent.adapter.ReloadAdapterGroupCommand",
|
agentUtilService.broadcast(pcommand);
|
||||||
adapterGroupName
|
}
|
||||||
);
|
|
||||||
agentUtilService.broadcast(acommand);
|
// 어댑터 그룹 리로드
|
||||||
|
CommonCommand acommand = new CommonCommand(
|
||||||
Command stdcommand = new ReloadSTDMessageCommand();
|
"com.eactive.eai.agent.adapter.ReloadAdapterGroupCommand",
|
||||||
stdcommand.setArgs("ALL");
|
adapterGroupUI.getAdptrbzwkgroupname()
|
||||||
|
);
|
||||||
|
receive = agentUtilService.broadcast(acommand);
|
||||||
|
|
||||||
|
// HS04 API_FULL_PATH
|
||||||
|
Command stdcommand = new ReloadSTDMessageCommand();
|
||||||
|
stdcommand.setArgs("ALL");
|
||||||
agentUtilService.broadcast(stdcommand);
|
agentUtilService.broadcast(stdcommand);
|
||||||
|
|
||||||
log.info(">>>>>> [Reload End] 모든 리로드 명령 전송 완료");
|
log.info(">>>>>> [Reload AdapterManService End] 리로드 완료");
|
||||||
} catch (Exception e) {
|
|
||||||
status = "error";
|
|
||||||
log.error("리로드 실패", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
result.put("status", status);
|
|
||||||
return result;
|
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
status = "error";
|
||||||
|
log.error("리로드 실패", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (receive != null && receive.values().stream().anyMatch(value -> value == null || !"success".equals(value))) {
|
||||||
|
status = "error";
|
||||||
|
}
|
||||||
|
|
||||||
|
result.put("status", status);
|
||||||
|
if(receive != null) result.put("message", receive.toString());
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<String, String> reloadSync(AdapterGroupUI adapterGroupUI) throws Exception {
|
public Map<String, String> reloadSync(AdapterGroupUI adapterGroupUI) throws Exception {
|
||||||
|
|||||||
Reference in New Issue
Block a user