From 42ba17fbbef44ba677a0cc2ae919598f541cd562 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 3 Jan 2019 11:59:27 -0500 Subject: [PATCH 1/2] Removes SessionControllerFactory's dependency on ResolvingIOManager --- .../Components/Watchdog/SessionControllerFactory.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs index cd1e7c082d..94990e1ba6 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs @@ -188,12 +188,10 @@ namespace Tgstation.Server.Host.Components.Watchdog ContractResolver = new CamelCasePropertyNamesContractResolver(), ReferenceLoopHandling = ReferenceLoopHandling.Ignore }); - - var localIoManager = new ResolvingIOManager(ioManager, basePath); - + var chatJsonTrackingTask = chat.TrackJsons(basePath, interopInfo.ChatChannelsJson, interopInfo.ChatCommandsJson, cancellationToken); - await localIoManager.WriteAllBytes(interopJsonFile, Encoding.UTF8.GetBytes(interopJson), cancellationToken).ConfigureAwait(false); + await ioManager.WriteAllBytes(ioManager.ConcatPath(basePath, interopJsonFile), Encoding.UTF8.GetBytes(interopJson), cancellationToken).ConfigureAwait(false); var chatJsonTrackingContext = await chatJsonTrackingTask.ConfigureAwait(false); try { From a275f9a3635ca9b4128778ad03033a7fb402f262 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 6 Jan 2019 16:44:33 -0500 Subject: [PATCH 2/2] Remove trailing whitespace --- .../Components/Watchdog/SessionControllerFactory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs index 94990e1ba6..71aa279f43 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs @@ -188,7 +188,7 @@ namespace Tgstation.Server.Host.Components.Watchdog ContractResolver = new CamelCasePropertyNamesContractResolver(), ReferenceLoopHandling = ReferenceLoopHandling.Ignore }); - + var chatJsonTrackingTask = chat.TrackJsons(basePath, interopInfo.ChatChannelsJson, interopInfo.ChatCommandsJson, cancellationToken); await ioManager.WriteAllBytes(ioManager.ConcatPath(basePath, interopJsonFile), Encoding.UTF8.GetBytes(interopJson), cancellationToken).ConfigureAwait(false);