From b615c4e297f729d38e8fbddeb702715c5bb480b4 Mon Sep 17 00:00:00 2001
From: Cameron Rushton <cameron.rushton@rogers.com>
Date: Mon, 27 Jan 2025 11:40:01 -0500
Subject: [PATCH] alter the logs to have orgId

---
 .../maas/ep/event/management/agent/command/CommandManager.java | 3 +--
 .../subscriber/messageProcessors/CommandMessageProcessor.java  | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/application/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java b/service/application/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java
index 4e0f1505..1197357b 100644
--- a/service/application/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java
+++ b/service/application/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java
@@ -231,7 +231,6 @@ private void finalizeAndSendResponse(CommandRequest requestBO) {
     }
 
     private Path executeTerraformCommand(CommandRequest request, Command command, Map<String, String> envVars) {
-        Path executionLog = null;
         try {
             Validate.isTrue(command.getCommandType().equals(terraform), "Command type must be terraform");
             return terraformManager.execute(request, command, envVars);
@@ -240,7 +239,7 @@ private Path executeTerraformCommand(CommandRequest request, Command command, Ma
             setCommandError(command, e);
 
         }
-        return executionLog;
+        return null;
     }
 
     private void executeSempCommand(Command command, SolaceHttpSemp solaceClient) {
diff --git a/service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/messageProcessors/CommandMessageProcessor.java b/service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/messageProcessors/CommandMessageProcessor.java
index e106c057..662a2020 100644
--- a/service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/messageProcessors/CommandMessageProcessor.java
+++ b/service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/messageProcessors/CommandMessageProcessor.java
@@ -38,7 +38,8 @@ public CommandMessageProcessor(CommandManager commandManager,
 
     @Override
     public void processMessage(CommandMessage message) {
-        log.info("Config push command processor started. context={} actorId={} ", message.getContext(), message.getActorId());
+        log.info("Config push command processor started. context={} orgId={} actorId={} ",
+                message.getContext(), message.getOrgId(), message.getActorId());
         logConfigPushMetric(message);
         if (CollectionUtils.isNotEmpty(message.getResources())) {
             dynamicResourceConfigurationHelper.loadSolaceBrokerResourceConfigurations(message.getResources());