From 1a0d8754d08ca4e1d985780497aea8f9c0da2d97 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 25 Sep 2018 22:00:19 -0400 Subject: [PATCH] Remove superfluous messages when attaching to a process --- src/Tgstation.Server.Host/Core/Process.cs | 9 ++++++++- src/Tgstation.Server.Host/Core/ProcessExecutor.cs | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Core/Process.cs b/src/Tgstation.Server.Host/Core/Process.cs index 7ea9434c74..10e9712d39 100644 --- a/src/Tgstation.Server.Host/Core/Process.cs +++ b/src/Tgstation.Server.Host/Core/Process.cs @@ -28,7 +28,7 @@ namespace Tgstation.Server.Host.Core /// readonly ILogger logger; - public Process(System.Diagnostics.Process handle, Task lifetime, StringBuilder outputStringBuilder, StringBuilder errorStringBuilder, StringBuilder combinedStringBuilder, ILogger logger) + public Process(System.Diagnostics.Process handle, Task lifetime, StringBuilder outputStringBuilder, StringBuilder errorStringBuilder, StringBuilder combinedStringBuilder, ILogger logger, bool preExisting) { this.handle = handle ?? throw new ArgumentNullException(nameof(handle)); Lifetime = lifetime ?? throw new ArgumentNullException(nameof(lifetime)); @@ -40,6 +40,13 @@ namespace Tgstation.Server.Host.Core this.logger = logger ?? throw new ArgumentNullException(nameof(logger)); Id = handle.Id; + + if (preExisting) + { + Startup = Task.CompletedTask; + return; + } + Startup = Task.Factory.StartNew(() => { try diff --git a/src/Tgstation.Server.Host/Core/ProcessExecutor.cs b/src/Tgstation.Server.Host/Core/ProcessExecutor.cs index 5aad8a9e8b..f1fc9e80bf 100644 --- a/src/Tgstation.Server.Host/Core/ProcessExecutor.cs +++ b/src/Tgstation.Server.Host/Core/ProcessExecutor.cs @@ -61,7 +61,7 @@ namespace Tgstation.Server.Host.Core var handle = System.Diagnostics.Process.GetProcessById(id); try { - return new Process(handle, AttachExitHandler(handle), null, null, null, loggerFactory.CreateLogger()); + return new Process(handle, AttachExitHandler(handle), null, null, null, loggerFactory.CreateLogger(), true); } catch { @@ -129,7 +129,7 @@ namespace Tgstation.Server.Host.Core } catch (InvalidOperationException) { } - return new Process(handle, lifetimeTask, outputStringBuilder, errorStringBuilder, combinedStringBuilder, loggerFactory.CreateLogger()); + return new Process(handle, lifetimeTask, outputStringBuilder, errorStringBuilder, combinedStringBuilder, loggerFactory.CreateLogger(), false); } catch {