OrcCommand: GetSamples: forward log options to 'GetThis'

src/OrcCommand/GetSamples_Run.cpp

@@ -26,6 +26,7 @@
 #include "FileStream.h"
 
 #include "TaskTracker.h"
+#include "Text/Iconv.h"
 
 using namespace Orc::Command::GetSamples;
 using namespace Orc;
@@ -396,6 +397,26 @@ HRESULT Main::RunGetThis(const std::wstring& strConfigFile, LPCWSTR szTempDir)
             std::make_shared<OnComplete>(OnComplete::Delete, L"GetThisConfig.xml", strConfigFile, nullptr));
     }
 
+    auto logConfig = m_utilitiesConfig.log;
+    const auto fileSinkOutput = m_logging.fileSink()->OutputPath();
+    if (fileSinkOutput && logConfig.file.path)
+    {
+        std::error_code ec;
+
+        // Override output log path with the one currently being use to ensure using the same file
+        const auto logPath = fmt::format(L"\"{}\"", fileSinkOutput->c_str());
+        logConfig.file.path = logPath;
+
+        // Override any disposition to be sure to append
+        logConfig.file.disposition = FileDisposition::Append;
+    }
+
+    const auto logArguments = UtilitiesLoggerConfiguration::ToCommandLineArguments(logConfig);
+    if (logArguments)
+    {
+        strConfigArg += L" " + *logArguments;
+    }
+
     command->AddArgument(strConfigArg, 0L);
 
     JobObject no_job;

src/OrcLib/CommandExecute.cpp

@@ -392,6 +392,9 @@ HRESULT CommandExecute::Execute(const JobObject& job, bool bBreakAway)
         }
     }
 
+    // Command as 'GetSamples' will create a child process 'GetThis' with the current log file path for appending
+    Log::Flush();
+
     if (ResumeThread(m_pi.hThread) == -1)
     {
         hr = HRESULT_FROM_WIN32(GetLastError());