got serilog reinstated

dahlsailrunner · dahlsailrunner · commit d6d9d14d88bb · 2020-07-16T13:31:01.000-05:00
diff --git a/AspNetCore-Effective-Logging/BookClub.API/BookClub.API.csproj b/AspNetCore-Effective-Logging/BookClub.API/BookClub.API.csproj
@@ -14,6 +14,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="NLog.Targets.ElasticSearch" Version="6.1.0" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.8.4" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
   </ItemGroup>
 
diff --git a/AspNetCore-Effective-Logging/BookClub.API/Program.cs b/AspNetCore-Effective-Logging/BookClub.API/Program.cs
@@ -3,7 +3,8 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
-using NLog.Web;
+//using NLog.Web;
+using Serilog;
 
 namespace BookClub.API
 {
@@ -17,35 +18,35 @@ public class Program
 
         public static void Main(string[] args)
         {
-            //Log.Logger = new LoggerConfiguration()
-            //    .ReadFrom.Configuration(Configuration)
-            //    //.WriteTo.File(new JsonFormatter(), @"c:\temp\logs\book-club.json", shared: true)
-            //    //.WriteTo.Seq("http://localhost:5341")
-            //    .CreateLogger();
-            var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
+            Log.Logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(Configuration)
+                //.WriteTo.File(new JsonFormatter(), @"c:\temp\logs\book-club.json", shared: true)
+                .WriteTo.Seq("http://localhost:5341")
+                .CreateLogger();
+            //var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
 
             try
             {
-                //Log.Information("Starting web host");
-                logger.Info("Starting web host");
+                Log.Information("Starting web host");
+                //logger.Info("Starting web host");
                 CreateWebHostBuilder(args).Build().Run();
             }
             catch (Exception ex)
             {
-                //Log.Fatal(ex, "Host terminated unexpectedly");
-                logger.Error(ex, "Host terminated unexpectedly");
+                Log.Fatal(ex, "Host terminated unexpectedly");
+                //logger.Error(ex, "Host terminated unexpectedly");
             }
             finally
             {
-                //Log.CloseAndFlush();
-                NLog.LogManager.Shutdown();
+                Log.CloseAndFlush();
+                //NLog.LogManager.Shutdown();
             }
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                //.UseSerilog();               
-                .UseNLog();
+                .UseSerilog();               
+                //.UseNLog();
     }
 }
diff --git a/AspNetCore-Effective-Logging/BookClub.UI/BookClub.UI.csproj b/AspNetCore-Effective-Logging/BookClub.UI/BookClub.UI.csproj
@@ -14,6 +14,9 @@
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
     <PackageReference Include="NLog.Targets.ElasticSearch" Version="6.1.0" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.8.4" />
+    <PackageReference Include="Serilog" Version="2.9.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
   </ItemGroup>
 
 
diff --git a/AspNetCore-Effective-Logging/BookClub.UI/Program.cs b/AspNetCore-Effective-Logging/BookClub.UI/Program.cs
@@ -3,7 +3,8 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
-using NLog.Web;
+//using NLog.Web;
+using Serilog;
 
 namespace BookClub.UI
 {
@@ -17,36 +18,36 @@ public class Program
 
         public static void Main(string[] args)
         {
-            //Log.Logger = new LoggerConfiguration()
-            //    .ReadFrom.Configuration(Configuration)
-            //    //.WriteTo.File(new JsonFormatter(), @"c:\temp\logs\book-club.json", shared: true)
-            //    .WriteTo.Seq("http://localhost:5341")
-            //    .CreateLogger();
+            Log.Logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(Configuration)
+                //.WriteTo.File(new JsonFormatter(), @"c:\temp\logs\book-club.json", shared: true)
+                .WriteTo.Seq("http://localhost:5341")
+                .CreateLogger();
 
-            var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
+            //var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
 
             try
             {
-                //Log.Information("Starting web host");
-                logger.Info("Starting web host");
+                Log.Information("Starting web host");
+                //logger.Info("Starting web host");
                 CreateWebHostBuilder(args).Build().Run();
             }
             catch (Exception ex)
             {
-                //Log.Fatal(ex, "Host terminated unexpectedly");
-                logger.Error(ex, "Host terminated unexpectedly");
+                Log.Fatal(ex, "Host terminated unexpectedly");
+                //logger.Error(ex, "Host terminated unexpectedly");
             }
             finally
             {
-                //Log.CloseAndFlush();
-                NLog.LogManager.Shutdown();
+                Log.CloseAndFlush();
+                //NLog.LogManager.Shutdown();
             }
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()                
-                //.UseSerilog();               
-                .UseNLog();
+                .UseSerilog();               
+                //.UseNLog();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`using Microsoft.AspNetCore;`
`4`	`4`	`using Microsoft.AspNetCore.Hosting;`
`5`	`5`	`using Microsoft.Extensions.Configuration;`
`6`		`-using NLog.Web;`
	`6`	`+//using NLog.Web;`
	`7`	`+using Serilog;`
`7`	`8`
`8`	`9`	`namespace BookClub.API`
`9`	`10`	`{`
`@@ -17,35 +18,35 @@ public class Program`
`17`	`18`
`18`	`19`	`public static void Main(string[] args)`
`19`	`20`	`{`
`20`		`- //Log.Logger = new LoggerConfiguration()`
`21`		`- // .ReadFrom.Configuration(Configuration)`
`22`		`- // //.WriteTo.File(new JsonFormatter(), @"c:\temp\logs\book-club.json", shared: true)`
`23`		`- // //.WriteTo.Seq("http://localhost:5341")`
`24`		`- // .CreateLogger();`
`25`		`- var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();`
	`21`	`+ Log.Logger = new LoggerConfiguration()`
	`22`	`+ .ReadFrom.Configuration(Configuration)`
	`23`	`+ //.WriteTo.File(new JsonFormatter(), @"c:\temp\logs\book-club.json", shared: true)`
	`24`	`+ .WriteTo.Seq("http://localhost:5341")`
	`25`	`+ .CreateLogger();`
	`26`	`+ //var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();`
`26`	`27`
`27`	`28`	`try`
`28`	`29`	`{`
`29`		`- //Log.Information("Starting web host");`
`30`		`- logger.Info("Starting web host");`
	`30`	`+ Log.Information("Starting web host");`
	`31`	`+ //logger.Info("Starting web host");`
`31`	`32`	`CreateWebHostBuilder(args).Build().Run();`
`32`	`33`	`}`
`33`	`34`	`catch (Exception ex)`
`34`	`35`	`{`
`35`		`- //Log.Fatal(ex, "Host terminated unexpectedly");`
`36`		`- logger.Error(ex, "Host terminated unexpectedly");`
	`36`	`+ Log.Fatal(ex, "Host terminated unexpectedly");`
	`37`	`+ //logger.Error(ex, "Host terminated unexpectedly");`
`37`	`38`	`}`
`38`	`39`	`finally`
`39`	`40`	`{`
`40`		`- //Log.CloseAndFlush();`
`41`		`- NLog.LogManager.Shutdown();`
	`41`	`+ Log.CloseAndFlush();`
	`42`	`+ //NLog.LogManager.Shutdown();`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`46`	`47`	`WebHost.CreateDefaultBuilder(args)`
`47`	`48`	`.UseStartup<Startup>()`
`48`		`- //.UseSerilog();`
`49`		`- .UseNLog();`
	`49`	`+ .UseSerilog();`
	`50`	`+ //.UseNLog();`
`50`	`51`	`}`
`51`	`52`	`}`