From c01841d7d7c00975c21aa5804627f5700aa707e2 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Wed, 15 May 2019 11:28:22 +0900 Subject: [PATCH 1/2] Use Logger for squirrel update logs --- osu.Desktop/Updater/SquirrelUpdateManager.cs | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs index 9681350ade..71cc7f6386 100644 --- a/osu.Desktop/Updater/SquirrelUpdateManager.cs +++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs @@ -2,8 +2,6 @@ // See the LICENCE file in the repository root for full licence text. using System; -using System.IO; -using System.Reflection; using System.Threading.Tasks; using osu.Framework.Allocation; using osu.Framework.Graphics; @@ -169,23 +167,14 @@ namespace osu.Desktop.Updater private class SquirrelLogger : Splat.ILogger, IDisposable { - private readonly string path; - private readonly object locker = new object(); public LogLevel Level { get; set; } = LogLevel.Info; - public SquirrelLogger() - { - var file = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location ?? Directory.GetCurrentDirectory()), "SquirrelSetupUpdater.log"); - if (File.Exists(file)) File.Delete(file); - path = file; - } - public void Write(string message, LogLevel logLevel) { if (logLevel < Level) return; - lock (locker) File.AppendAllText(path, message + "\r\n"); + Logger.Log(message); } public void Dispose() From 501eaa072e62d321f0d3804568cd61b1d998e330 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 15 May 2019 14:12:59 +0900 Subject: [PATCH 2/2] Use local logger --- osu.Desktop/Updater/SquirrelUpdateManager.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs index 71cc7f6386..e2c7a5e892 100644 --- a/osu.Desktop/Updater/SquirrelUpdateManager.cs +++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs @@ -169,12 +169,17 @@ namespace osu.Desktop.Updater { public LogLevel Level { get; set; } = LogLevel.Info; + private Logger logger; + public void Write(string message, LogLevel logLevel) { if (logLevel < Level) return; - Logger.Log(message); + if (logger == null) + logger = Logger.GetLogger("updater"); + + logger.Add(message); } public void Dispose()