From 18a0a791fd9f56c08a81b622ea0f196fef00097a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 28 Nov 2021 22:24:42 +0900
Subject: [PATCH] Refactor

---
 osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs |  5 +++--
 osu.Desktop/Program.cs                        | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs b/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs
index 43d9dd741c..7855f9c7ce 100644
--- a/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs
+++ b/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs
@@ -13,7 +13,7 @@ namespace osu.Desktop.LegacyIpc
     /// </summary>
     public class LegacyTcpIpcProvider : TcpIpcProvider
     {
-        private static readonly Logger logger = Logger.GetLogger("ipc");
+        private static readonly Logger logger = Logger.GetLogger("legacy-ipc");
 
         /// <summary>
         /// Invoked when a message is received from a legacy client.
@@ -27,7 +27,8 @@ namespace osu.Desktop.LegacyIpc
             {
                 try
                 {
-                    logger.Add($"Processing incoming IPC message: {msg.Value}");
+                    logger.Add($"Processing legacy IPC message...");
+                    logger.Add($"\t{msg.Value}", LogLevel.Debug);
 
                     var legacyData = ((JObject)msg.Value).ToObject<LegacyIpcMessage.Data>();
                     object value = parseObject((JObject)legacyData!.MessageData, legacyData.MessageType);
diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index c41a6a4f5d..9542ccd8dc 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -28,6 +28,8 @@ namespace osu.Desktop
     {
         private const string base_game_name = @"osu";
 
+        private static LegacyTcpIpcProvider legacyIpc;
+
         [STAThread]
         public static void Main(string[] args)
         {
@@ -92,10 +94,18 @@ namespace osu.Desktop
 
                 if (host.IsPrimaryInstance)
                 {
-                    var legacyIpc = new LegacyTcpIpcProvider();
-                    legacyIpc.MessageReceived += onLegacyIpcMessageReceived;
-                    legacyIpc.Bind();
-                    legacyIpc.StartAsync();
+                    try
+                    {
+                        Logger.Log("Starting legacy IPC provider...");
+                        legacyIpc = new LegacyTcpIpcProvider();
+                        legacyIpc.MessageReceived += onLegacyIpcMessageReceived;
+                        legacyIpc.Bind();
+                        legacyIpc.StartAsync();
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Error(ex, "Failed to start legacy IPC provider");
+                    }
                 }
 
                 if (tournamentClient)