From 255ac3d703d16334993e399e2199fbc16a8fa0f6 Mon Sep 17 00:00:00 2001 From: "semin.baek" Date: Wed, 25 Jun 2025 10:30:06 +0900 Subject: [PATCH] =?UTF-8?q?User=20agent=20=EC=A0=95=EB=B3=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80:=20postman,=20alive,=20command-line=20alive,=20dropbo?= =?UTF-8?q?x-ack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/bsmlab/dfx/agent/DfxAgentRunner.java | 5 ++++- .../agent/task/dropbox/DropBoxSchedulerService.java | 5 ++++- .../agent/task/postman/PostmanSchedulerService.java | 10 ++++++++-- .../task/status/StatusCheckerSchedulerService.java | 5 ++++- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bsmlab/dfx/agent/DfxAgentRunner.java b/src/main/java/com/bsmlab/dfx/agent/DfxAgentRunner.java index a9475e8..986fa0d 100644 --- a/src/main/java/com/bsmlab/dfx/agent/DfxAgentRunner.java +++ b/src/main/java/com/bsmlab/dfx/agent/DfxAgentRunner.java @@ -92,7 +92,10 @@ public class DfxAgentRunner implements ApplicationRunner { CommandDto commandDto = CommandDto.builder().commandType(CommandDto.CommandType.ALIVE).messageUuid(messageUuid).build(); HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.setContentType(MediaType.APPLICATION_JSON); - httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId()); + httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId() + + ", action: agent-check(ALIVE: command line)" + ); HttpEntity bodyEntity = new HttpEntity<>(commandDto, httpHeaders); RestTemplate restTemplate = new RestTemplate(); String url = "http://" + knownAgent.getHostName() + ":" + knownAgent.getListenPort() + "/command"; diff --git a/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxSchedulerService.java b/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxSchedulerService.java index 9c691e2..d38b183 100644 --- a/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxSchedulerService.java +++ b/src/main/java/com/bsmlab/dfx/agent/task/dropbox/DropBoxSchedulerService.java @@ -135,7 +135,10 @@ public class DropBoxSchedulerService { AckDto ackDto = AckDto.builder().result(resultType).messageUuid(receiveMessageDto.getMessageUuid()).resultText(processMessage).build(); HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.setContentType(MediaType.APPLICATION_JSON); - httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId()); + httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId() + + ", action: dropbox-ack(recipient-dropbox-id: " + receiveMessageDto.getRecipientDropBoxId() + ", message-uuid: " + receiveMessageDto.getMessageUuid() + ")" + ); HttpEntity bodyEntity = new HttpEntity<>(ackDto, httpHeaders); RestTemplate restTemplate = new RestTemplate(); AgentConfigDto.KnownAgent knownAgent = agentConfigReader.getKnownAgent(receiveMessageDto.getSenderHostId()); diff --git a/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java b/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java index 65fa826..06a1333 100644 --- a/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java +++ b/src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java @@ -91,7 +91,10 @@ public class PostmanSchedulerService { .data(dataString).build(); HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.setContentType(MediaType.APPLICATION_JSON); - httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId()); + httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId() + + ", action: postman(postman-id: " + postman.getPostmanId() + ")" + ); HttpEntity bodyEntity = new HttpEntity<>(receiveMessageDto, httpHeaders); RestTemplate restTemplate = new RestTemplate(); String url = "http://" + knownAgent.getHostName() + ":" + knownAgent.getListenPort() + "/listen"; @@ -170,7 +173,10 @@ public class PostmanSchedulerService { // http 준비 HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.setContentType(MediaType.MULTIPART_FORM_DATA); - httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId()); + httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId() + + ", action: postman(postman-id: " + postman.getPostmanId() + ")" + ); MultiValueMap body = new LinkedMultiValueMap<>(); // 첫 번째 멀티파트는 message json body.add("json", new HttpEntity<>(messageString, httpHeaders)); diff --git a/src/main/java/com/bsmlab/dfx/agent/task/status/StatusCheckerSchedulerService.java b/src/main/java/com/bsmlab/dfx/agent/task/status/StatusCheckerSchedulerService.java index eba867c..807c656 100644 --- a/src/main/java/com/bsmlab/dfx/agent/task/status/StatusCheckerSchedulerService.java +++ b/src/main/java/com/bsmlab/dfx/agent/task/status/StatusCheckerSchedulerService.java @@ -46,7 +46,10 @@ public class StatusCheckerSchedulerService { CommandDto commandDto = CommandDto.builder().commandType(CommandDto.CommandType.ALIVE).messageUuid(messageUuid).build(); HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.setContentType(MediaType.APPLICATION_JSON); - httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId()); + httpHeaders.set("User-Agent", agentConfigReader.getApplicationName() + ", version: " + agentConfigReader.getApplicationVersion() + "(" + agentConfigReader.getApplicationCommitId() + ")" + + ", host ID: " + agentConfigReader.getAgentConfigDto().getMyHostId() + + ", action: status-check(ALIVE)" + ); HttpEntity bodyEntity = new HttpEntity<>(commandDto, httpHeaders); RestTemplate restTemplate = new RestTemplate(); String url = "http://" + knownAgent.getHostName() + ":" + knownAgent.getListenPort() + "/command";