Merge pull request #18576 from AttilaVamos/HPCC-31671-9.6.x-impr

HPCC-31671 Add resolved "CommandMessage" field to GetDFUWorkunits result. Reviewed-by: Jake Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Apr 29, 2024 · d5a8ba7 · d5a8ba7
2 parents 62b4f47 + feb94f9
commit d5a8ba7
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/esp/services/ws_fs/ws_fsService.cpp b/esp/services/ws_fs/ws_fsService.cpp
@@ -1109,7 +1109,14 @@ bool CFileSprayEx::onGetDFUWorkunits(IEspContext &context, IEspGetDFUWorkunits &
             resultWU->setID(wu->queryId());
             StringBuffer jobname, user, cluster;
             resultWU->setJobName(wu->getJobName(jobname).str());
-            resultWU->setCommand(wu->getCommand());
+            DFUcmd command = wu->getCommand();
+            resultWU->setCommand(command);
+            if (version >= 1.03)
+            {
+                StringBuffer cmdStr;
+                encodeDFUcommand(command, cmdStr);
+                resultWU->setCommandMessage(cmdStr.str());
+            }
             resultWU->setUser(wu->getUser(user).str());
 
             const char* clusterName = wu->getClusterName(cluster).str();