update logger

JetBrains · May 3, 2021 · 9d8eb37 · 9d8eb37
1 parent fada15b
commit 9d8eb37
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/ReSharper.FSharp/src/FSharp.ExternalFormatter.Host/src/ExternalFormatterEndPoint.cs b/ReSharper.FSharp/src/FSharp.ExternalFormatter.Host/src/ExternalFormatterEndPoint.cs
@@ -3,36 +3,29 @@
 using JetBrains.Diagnostics;
 using JetBrains.Lifetimes;
 using JetBrains.Platform.RdFramework.ExternalProcess;
+using JetBrains.Platform.RdFramework.ExternalProcess.Util;
 using JetBrains.Rd.Impl;
 using JetBrains.Rider.FSharp.ExternalFormatter.Client;
 using JetBrains.Util;
-using JetBrains.Util.Logging;
 using JetBrains.Rd.Tasks;
 
 namespace FSharp.ExternalFormatter.Host
 {
   internal class ExternalFormatterEndPoint : ProtocolEndPoint<RdFSharpExternalFormatterModel, RdSimpleDispatcher>
   {
-    private readonly ExternalCodeFormatter myCodeFormatter;
+    private readonly FantomasCodeFormatter myCodeFormatter;
     protected override string ProtocolName => "External Formatter Host";
 
     public ExternalFormatterEndPoint() : base(FantomasProtocolConstants.PARENT_PROCESS_PID_ENV_VARIABLE)
     {
-      myCodeFormatter = new ExternalCodeFormatter();
+      myCodeFormatter = new FantomasCodeFormatter();
     }
 
     protected override RdSimpleDispatcher InitDispatcher(Lifetime lifetime, ILogger logger) =>
       new RdSimpleDispatcher(lifetime, logger);
 
-    protected override void InitLogger(Lifetime lifetime, string path)
-    {
-      LogManager.Instance.SetConfig(new XmlLogConfigModel());
-      var logPath = FileSystemPath.TryParse(path);
-      if (logPath.IsNullOrEmpty()) return;
-
-      var logEventListener = new FileLogEventListener(logPath);
-      LogManager.Instance.AddOmnipresentLogger(lifetime, logEventListener, LoggingLevel.TRACE);
-    }
+    protected override void InitLogger(Lifetime lifetime, string path) =>
+      ProtocolEndPointUtil.InitLogger(path, lifetime, LoggingLevel.TRACE);
 
     protected override RdFSharpExternalFormatterModel InitModel(Lifetime lifetime, JetBrains.Rd.Impl.Protocol protocol)
     {

diff --git a/...rmatter.Host/src/CodeFormatterProvider.cs → ...rmatter.Host/src/FantomasCodeFormatter.cs b/...rmatter.Host/src/CodeFormatterProvider.cs → ...rmatter.Host/src/FantomasCodeFormatter.cs
@@ -8,7 +8,7 @@
 
 namespace FSharp.ExternalFormatter.Host
 {
-  internal class ExternalCodeFormatter
+  internal class FantomasCodeFormatter
   {
     private readonly FSharpChecker myChecker =
       FSharpChecker.Create(null, null, null, null, null, null, null, null, null, null);

diff --git a/ReSharper.FSharp/src/FSharp.TypeProviders.Host/src/TypeProvidersEndPoint.cs b/ReSharper.FSharp/src/FSharp.TypeProviders.Host/src/TypeProvidersEndPoint.cs
@@ -2,12 +2,12 @@
 using JetBrains.Diagnostics;
 using JetBrains.Lifetimes;
 using JetBrains.Platform.RdFramework.ExternalProcess;
+using JetBrains.Platform.RdFramework.ExternalProcess.Util;
 using JetBrains.Rd.Impl;
 using JetBrains.ReSharper.Plugins.FSharp.TypeProviders.Host.Hosts;
 using JetBrains.ReSharper.Plugins.FSharp.TypeProviders.Protocol;
 using JetBrains.Rider.FSharp.TypeProviders.Protocol.Server;
 using JetBrains.Util;
-using JetBrains.Util.Logging;
 
 namespace JetBrains.ReSharper.Plugins.FSharp.TypeProviders.Host
 {
@@ -30,12 +30,7 @@ protected override RdSimpleDispatcher InitDispatcher(Lifetime lifetime, ILogger
 
     protected override void InitLogger(Lifetime lifetime, string path)
     {
-      LogManager.Instance.SetConfig(new XmlLogConfigModel());
-      var logPath = FileSystemPath.TryParse(path);
-      if (logPath.IsNullOrEmpty()) return;
-
-      var logEventListener = new FileLogEventListener(logPath);
-      LogManager.Instance.AddOmnipresentLogger(lifetime, logEventListener, LoggingLevel.TRACE);
+      ProtocolEndPointUtil.InitLogger(path, lifetime, LoggingLevel.TRACE);
       Logger.Log(LoggingLevel.INFO, $"Process Runtime: {RuntimeInformation.FrameworkDescription}");
     }