Change log4net to use Microsoft.Extensions.Logging.

paulirwin · paulirwin · commit 8d1a00513f37 · 2022-03-09T14:36:04.000-07:00
diff --git a/JavaToCSharpCli/JavaToCSharpCli.csproj b/JavaToCSharpCli/JavaToCSharpCli.csproj
@@ -1,18 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>2.0.2</Version>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\JavaToCSharp\JavaToCSharp.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 </Project>
diff --git a/JavaToCSharpCli/Program.cs b/JavaToCSharpCli/Program.cs
@@ -1,18 +1,23 @@
 ﻿using System;
 using System.IO;
+using System.Threading;
 using JavaToCSharp;
-using log4net;
-using log4net.Config;
+using Microsoft.Extensions.Logging;
 
 namespace JavaToCSharpCli
 {
     public class Program
     {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(Program));
+        private static readonly ILogger _logger;
+
+        static Program()
+        {
+            var loggerFactory = LoggerFactory.Create(builder => builder.AddSimpleConsole().SetMinimumLevel(LogLevel.Information));
+            _logger = loggerFactory.CreateLogger<Program>();
+        }
+
         public static void Main(string[] args)
         {
-            GlobalContext.Properties["appname"] = "JavaToCSharpCli";
-            XmlConfigurator.ConfigureAndWatch(new FileInfo("log4net.config"));
             try
             {
                 if (args == null || args.Length < 3)
@@ -31,10 +36,13 @@ public static void Main(string[] args)
                             break;
                     }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
-                _logger.Error(ex.Message, ex);
+                _logger.LogError(ex.Message, ex);
             }
+
+            // allow logger background thread to flush
+            Thread.Sleep(TimeSpan.FromSeconds(1));
         }
 
         private static void ConvertToCSharpDir(string folderPath, string outputFolderPath)
@@ -46,17 +54,17 @@ private static void ConvertToCSharpDir(string folderPath, string outputFolderPat
                 foreach (var f in input.GetFiles("*.java", SearchOption.AllDirectories))
                     ConvertToCSharpFile(
                         f.FullName,
-                        Path.Combine(output.FullName, f.Name.Replace(f.Extension, ".cs")), 
+                        Path.Combine(output.FullName, f.Name.Replace(f.Extension, ".cs")),
                         false);
             }
             else
-                _logger.Info("Java input folder doesn't exist!");
+                _logger.LogError("Java input folder {path} doesn't exist!", folderPath);
         }
 
         private static void ConvertToCSharpFile(string filePath, string outputFilePath, bool overwrite = true)
         {
             if (!overwrite && File.Exists(outputFilePath))
-                _logger.Info($"{outputFilePath} exists, skip to next.");
+                _logger.LogInformation("{outputFilePath} exists, skip to next.", outputFilePath);
             else if (File.Exists(filePath))
             {
                 try
@@ -65,26 +73,26 @@ private static void ConvertToCSharpFile(string filePath, string outputFilePath,
                     var options = new JavaConversionOptions();
 
                     options.WarningEncountered += (sender, eventArgs)
-                        => _logger.Warn($"[WARNING] Line {eventArgs.JavaLineNumber}: {eventArgs.Message}");
+                        => _logger.LogWarning("Line {line}: {message}", eventArgs.JavaLineNumber, eventArgs.Message);
 
                     var parsed = JavaToCSharpConverter.ConvertText(javaText, options);
 
                     File.WriteAllText(outputFilePath, parsed);
-                    _logger.Info($"{filePath} was done!");
+                    _logger.LogInformation("{filePath} converted!", filePath);
                 }
                 catch (Exception ex)
                 {
-                    _logger.Error($"{filePath} was failed! err = " + ex.Message, ex);
+                    _logger.LogError("{filePath} failed! {type}: {message}", filePath, ex.GetType().Name, ex.Message);
                 }
             }
             else
-                _logger.Info("Java input file doesn't exist!");
+                _logger.LogError("Java input file {filePath} doesn't exist!", filePath);
         }
 
         private static void ShowHelp()
         {
             Console.WriteLine("Usage:\r\n\tJavaToCSharpCli.exe -f [pathToJavaFile] [pathToCsOutputFile]");
-            Console.WriteLine("Usage:\tJavaToCSharpCli.exe -d [pathToJavaFolder] [pathToCsOutputFolder]");
+            Console.WriteLine("\tJavaToCSharpCli.exe -d [pathToJavaFolder] [pathToCsOutputFolder]");
         }
     }
 }
diff --git a/JavaToCSharpCli/log4net.config b/JavaToCSharpCli/log4net.config

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,23 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using System.Threading;`
`3`	`4`	`using JavaToCSharp;`
`4`		`-using log4net;`
`5`		`-using log4net.Config;`
	`5`	`+using Microsoft.Extensions.Logging;`
`6`	`6`
`7`	`7`	`namespace JavaToCSharpCli`
`8`	`8`	`{`
`9`	`9`	`public class Program`
`10`	`10`	`{`
`11`		`- private static readonly ILog _logger = LogManager.GetLogger(typeof(Program));`
	`11`	`+ private static readonly ILogger _logger;`
	`12`	`+`
	`13`	`+ static Program()`
	`14`	`+ {`
	`15`	`+ var loggerFactory = LoggerFactory.Create(builder => builder.AddSimpleConsole().SetMinimumLevel(LogLevel.Information));`
	`16`	`+ _logger = loggerFactory.CreateLogger<Program>();`
	`17`	`+ }`
	`18`	`+`
`12`	`19`	`public static void Main(string[] args)`
`13`	`20`	`{`
`14`		`- GlobalContext.Properties["appname"] = "JavaToCSharpCli";`
`15`		`- XmlConfigurator.ConfigureAndWatch(new FileInfo("log4net.config"));`
`16`	`21`	`try`
`17`	`22`	`{`
`18`	`23`	`if (args == null \|\| args.Length < 3)`
`@@ -31,10 +36,13 @@ public static void Main(string[] args)`
`31`	`36`	`break;`
`32`	`37`	`}`
`33`	`38`	`}`
`34`		`- catch(Exception ex)`
	`39`	`+ catch (Exception ex)`
`35`	`40`	`{`
`36`		`- _logger.Error(ex.Message, ex);`
	`41`	`+ _logger.LogError(ex.Message, ex);`
`37`	`42`	`}`
	`43`	`+`
	`44`	`+ // allow logger background thread to flush`
	`45`	`+ Thread.Sleep(TimeSpan.FromSeconds(1));`
`38`	`46`	`}`
`39`	`47`
`40`	`48`	`private static void ConvertToCSharpDir(string folderPath, string outputFolderPath)`
`@@ -46,17 +54,17 @@ private static void ConvertToCSharpDir(string folderPath, string outputFolderPat`
`46`	`54`	`foreach (var f in input.GetFiles("*.java", SearchOption.AllDirectories))`
`47`	`55`	`ConvertToCSharpFile(`
`48`	`56`	`f.FullName,`
`49`		`- Path.Combine(output.FullName, f.Name.Replace(f.Extension, ".cs")),`
	`57`	`+ Path.Combine(output.FullName, f.Name.Replace(f.Extension, ".cs")),`
`50`	`58`	`false);`
`51`	`59`	`}`
`52`	`60`	`else`
`53`		`- _logger.Info("Java input folder doesn't exist!");`
	`61`	`+ _logger.LogError("Java input folder {path} doesn't exist!", folderPath);`
`54`	`62`	`}`
`55`	`63`
`56`	`64`	`private static void ConvertToCSharpFile(string filePath, string outputFilePath, bool overwrite = true)`
`57`	`65`	`{`
`58`	`66`	`if (!overwrite && File.Exists(outputFilePath))`
`59`		`- _logger.Info($"{outputFilePath} exists, skip to next.");`
	`67`	`+ _logger.LogInformation("{outputFilePath} exists, skip to next.", outputFilePath);`
`60`	`68`	`else if (File.Exists(filePath))`
`61`	`69`	`{`
`62`	`70`	`try`
`@@ -65,26 +73,26 @@ private static void ConvertToCSharpFile(string filePath, string outputFilePath,`
`65`	`73`	`var options = new JavaConversionOptions();`
`66`	`74`
`67`	`75`	`options.WarningEncountered += (sender, eventArgs)`
`68`		`- => _logger.Warn($"[WARNING] Line {eventArgs.JavaLineNumber}: {eventArgs.Message}");`
	`76`	`+ => _logger.LogWarning("Line {line}: {message}", eventArgs.JavaLineNumber, eventArgs.Message);`
`69`	`77`
`70`	`78`	`var parsed = JavaToCSharpConverter.ConvertText(javaText, options);`
`71`	`79`
`72`	`80`	`File.WriteAllText(outputFilePath, parsed);`
`73`		`- _logger.Info($"{filePath} was done!");`
	`81`	`+ _logger.LogInformation("{filePath} converted!", filePath);`
`74`	`82`	`}`
`75`	`83`	`catch (Exception ex)`
`76`	`84`	`{`
`77`		`- _logger.Error($"{filePath} was failed! err = " + ex.Message, ex);`
	`85`	`+ _logger.LogError("{filePath} failed! {type}: {message}", filePath, ex.GetType().Name, ex.Message);`
`78`	`86`	`}`
`79`	`87`	`}`
`80`	`88`	`else`
`81`		`- _logger.Info("Java input file doesn't exist!");`
	`89`	`+ _logger.LogError("Java input file {filePath} doesn't exist!", filePath);`
`82`	`90`	`}`
`83`	`91`
`84`	`92`	`private static void ShowHelp()`
`85`	`93`	`{`
`86`	`94`	`Console.WriteLine("Usage:\r\n\tJavaToCSharpCli.exe -f [pathToJavaFile] [pathToCsOutputFile]");`
`87`		`- Console.WriteLine("Usage:\tJavaToCSharpCli.exe -d [pathToJavaFolder] [pathToCsOutputFolder]");`
	`95`	`+ Console.WriteLine("\tJavaToCSharpCli.exe -d [pathToJavaFolder] [pathToCsOutputFolder]");`
`88`	`96`	`}`
`89`	`97`	`}`
`90`	`98`	`}`