Revert "Add support for capturing the output of Processes (#135)"

This reverts commit ebe538b.

VmAgent.Core/Interfaces/BaseSessionHostRunner.cs

@@ -38,6 +38,8 @@ protected BaseSessionHostRunner(
 
         abstract public Task CollectLogs(string id, string logsFolder, ISessionHostManager sessionHostManager);
 
+        abstract public Task CreateStartGameExceptionLogs(string logsFolder, string exceptionMessage);
+
         abstract public Task<SessionHostInfo> CreateAndStart(int instanceNumber, GameResourceDetails gameResourceDetails, ISessionHostManager sessionHostManager);
 
         abstract public Task DeleteResources(SessionHostsStartInfo sessionHostsStartInfo);

VmAgent.Core/Interfaces/DockerContainerEngine.cs

@@ -680,5 +680,10 @@ private string GetGameWorkingDir(SessionHostsStartInfo request)
             }
             return null;
         }
+
+        public override Task CreateStartGameExceptionLogs(string logsFolder, string exceptionMessage)
+        {
+            return Task.CompletedTask;
+        }
     }
 }

VmAgent.Core/Interfaces/IProcessWrapper.cs

@@ -3,7 +3,6 @@
 
 namespace Microsoft.Azure.Gaming.VmAgent.Core.Interfaces
 {
-    using System;
     using System.Collections.Generic;
     using System.Diagnostics;
 
@@ -13,8 +12,6 @@ public interface IProcessWrapper
 
         int Start(ProcessStartInfo startInfo);
 
-        int StartWithEventHandler(ProcessStartInfo startInfo, Action<object, DataReceivedEventArgs> StdOutputHandler, Action<object, DataReceivedEventArgs> ErrorOutputHandler, Action<object, EventArgs> ProcessExitedHandler);
-
         IEnumerable<int> List();
 
         void WaitForProcessExit(int id);

VmAgent.Core/Interfaces/ISessionHostRunner.cs

@@ -26,5 +26,6 @@ public interface ISessionHostRunner
 
         Task CollectLogs(string id, string logsFolder, ISessionHostManager sessionHostManager);
 
+        Task CreateStartGameExceptionLogs(string logFolder, string exceptionMessage);
     }
 }

VmAgent.Core/Interfaces/ProcessRunner.cs

@@ -44,17 +44,6 @@ public override Task<SessionHostInfo> CreateAndStart(int instanceNumber, GameRes
             string configFolderPathOnVm = _vmConfiguration.GetConfigRootFolderForSessionHost(instanceNumber);
             _systemOperations.CreateDirectory(configFolderPathOnVm);
 
-            string processOutputFilePathOnVm = Path.Combine(logFolderPathOnVm, ConsoleLogCaptureFileName);
-            ProcessOutputLogger processOutputLogger = null;
-            try
-            {
-                processOutputLogger = new ProcessOutputLogger(processOutputFilePathOnVm, _logger);
-            }
-            catch(Exception exception)
-            {
-                _logger.LogException($"Failed to create ProcessOutputLogger with instance number {instanceNumber}", exception);
-            }
-
             ProcessStartInfo processStartInfo = new ProcessStartInfo();
             (string executableFileName, string arguments) = GetExecutableAndArguments(sessionHostStartInfo, instanceNumber);
             processStartInfo.FileName = executableFileName;
@@ -69,10 +58,8 @@ public override Task<SessionHostInfo> CreateAndStart(int instanceNumber, GameRes
 
             try
             {
-                int processId = processOutputLogger != null ? 
-                    _processWrapper.StartWithEventHandler(processStartInfo, processOutputLogger.StdOutputHandler, processOutputLogger.ErrorOutputHandler, processOutputLogger.ProcessExitedHandler) : _processWrapper.Start(processStartInfo);
-
-                sessionHostManager.UpdateSessionHostTypeSpecificId(sessionHostUniqueId, processId.ToString());
+                string processId = _processWrapper.Start(processStartInfo).ToString();
+                sessionHostManager.UpdateSessionHostTypeSpecificId(sessionHostUniqueId, processId);
                 _logger.LogInformation($"Started process for session host. Instance Number: {instanceNumber}, UniqueId: {sessionHostUniqueId}, ProcessId: {processId}");
             }
             catch (Exception exception)
@@ -81,16 +68,9 @@ public override Task<SessionHostInfo> CreateAndStart(int instanceNumber, GameRes
                 sessionHostManager.RemoveSessionHost(sessionHostUniqueId);
                 sessionHost = null;
                 string exceptionMessage = exception.ToString();
-
-                if (processOutputLogger != null)
-                {
-                    CreateStartGameExceptionLogs(processOutputLogger, exceptionMessage);
-                }
-                else
-                {
-                    _logger.LogException($"processOutputlogger is not initialized. Failed to write failed start game error logs to {ConsoleLogCaptureFileName} for Process.", exception);
-                }
+                CreateStartGameExceptionLogs(logFolderPathOnVm, exceptionMessage);
             }
+
             return Task.FromResult(sessionHost);
         }
 
@@ -102,19 +82,25 @@ public override Task CollectLogs(string processId, string logsFolder, ISessionHo
             return Task.CompletedTask;
         }
 
-        public void CreateStartGameExceptionLogs(ProcessOutputLogger processOutputLogger, string exceptionMessage)
+        public override Task CreateStartGameExceptionLogs(string logsFolder, string exceptionMessage)
         {
             try
             {
                 _logger.LogVerbose("Collecting logs for failed start game process.");
-                _logger.LogVerbose($"Written logs for failed start game process to {processOutputLogger.GetProcessLogFilePath()}.");
-                processOutputLogger.Log(exceptionMessage);
+                string destinationFileName = Path.Combine(logsFolder, ConsoleLogCaptureFileName);
 
+                using (StreamWriter sw = File.AppendText(destinationFileName))
+                {
+                    sw.WriteLine(DateTime.Now.ToString("yyyy-MM-dd'T'HH:mm:ss.fffK"));
+                    sw.WriteLine($"{exceptionMessage}");
+                }
+                _logger.LogVerbose($"Written logs for failed start game process to {destinationFileName}.");
             }
             catch (Exception ex)
             {
                 _logger.LogException($"Failed to write failed start game error logs for process", ex);
             }
+            return Task.CompletedTask;
         }
 
         private (string, string) GetExecutableAndArguments(SessionHostsStartInfo sessionHostsStartInfo, int instanceNumber)

VmAgent.Core/Interfaces/ProcessWrapper.cs

@@ -7,6 +7,7 @@ namespace Microsoft.Azure.Gaming.VmAgent.Core.Interfaces
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Linq;
+    using System.Threading.Tasks;
 
     public class ProcessWrapper : IProcessWrapper
     {
@@ -34,24 +35,6 @@ public int Start(ProcessStartInfo startInfo)
             return Process.Start(startInfo).Id;
         }
 
-        public int StartWithEventHandler(ProcessStartInfo startInfo, Action<object, DataReceivedEventArgs> StdOutputHandler, Action<object, DataReceivedEventArgs> ErrorOutputHandler, Action<object, EventArgs> ProcessExitedHandler)
-        {
-            startInfo.RedirectStandardOutput = true;
-            startInfo.RedirectStandardError = true;
-
-            Process process = new Process();
-            process.StartInfo = startInfo;
-            process.OutputDataReceived += new DataReceivedEventHandler(StdOutputHandler);
-            process.ErrorDataReceived += new DataReceivedEventHandler(ErrorOutputHandler);
-            process.Exited += new EventHandler(ProcessExitedHandler);
-            process.EnableRaisingEvents = true;
-            process.Start();
-            process.BeginOutputReadLine();
-            process.BeginErrorReadLine();
-
-            return process.Id;
-        }
-
         public IEnumerable<int> List()
         {
             return Process.GetProcesses().Select(x => x.Id);