make sure everything has a log context

thefringeninja · thefringeninja · commit 3dcbf30fd008 · 2019-05-23T16:46:42.000+02:00
diff --git a/src/SqlStreamStore.Server/Browser/SqlStreamStoreBrowserMiddleware.cs b/src/SqlStreamStore.Server/Browser/SqlStreamStoreBrowserMiddleware.cs
@@ -11,6 +11,7 @@ namespace SqlStreamStore.Server.Browser
 {
     internal static class SqlStreamStoreBrowserMiddleware
     {
+        private static readonly ILogger s_Log = Log.ForContext(typeof(SqlStreamStoreBrowserMiddleware));
         public static IApplicationBuilder UseSqlStreamStoreBrowser(
             this IApplicationBuilder builder,
             Type rootType = default)
@@ -23,7 +24,7 @@ public static IApplicationBuilder UseSqlStreamStoreBrowser(
             var staticFiles = rootType.Assembly.GetManifestResourceNames()
                 .Where(name => name.StartsWith(rootType.Namespace));
 
-            Log.Debug(
+            s_Log.Debug(
                 "The following embedded resources were found and will be served as static content: {staticFiles}",
                 string.Join(", ", staticFiles));
 
diff --git a/src/SqlStreamStore.Server/DatabaseInitializer.cs b/src/SqlStreamStore.Server/DatabaseInitializer.cs
@@ -7,10 +7,13 @@
 using Serilog;
 using SqlStreamStore.Infrastructure;
 using static SqlStreamStore.Server.Constants;
+
 namespace SqlStreamStore.Server
 {
     internal class DatabaseInitializer
     {
+        private static readonly ILogger s_Log = Log.ForContext<DatabaseInitializer>();
+
         private readonly SqlStreamStoreServerConfiguration _configuration;
 
         public DatabaseInitializer(SqlStreamStoreServerConfiguration configuration)
@@ -34,7 +37,7 @@ public Task Initialize(CancellationToken cancellationToken = default)
                 case postgres:
                     return InitializePostgres(cancellationToken);
                 default:
-                    Log.Warning("Provider {provider} has no database initializer.", _configuration.Provider);
+                    s_Log.Warning("Provider {provider} has no database initializer.", _configuration.Provider);
                     return Task.CompletedTask;
             }
         }
@@ -45,7 +48,7 @@ private async Task InitializeMySql(CancellationToken cancellationToken)
 
             var cmdText = $"CREATE DATABASE IF NOT EXISTS `{connectionStringBuilder.Database}`";
 
-            Log.Information(
+            s_Log.Information(
                 "Creating database '{database}' at server '{server}' with the statement: {cmdText}",
                 connectionStringBuilder.Database,
                 connectionStringBuilder.Server,
@@ -78,7 +81,7 @@ IF  NOT EXISTS (SELECT name FROM sys.databases WHERE name = N'{connectionStringB
     CREATE DATABASE [{connectionStringBuilder.InitialCatalog}]
 END;
 ";
-            Log.Information(
+            s_Log.Information(
                 "Creating database '{database}' at server '{server}' with the statement: {cmdText}",
                 connectionStringBuilder.InitialCatalog,
                 connectionStringBuilder.DataSource,
@@ -107,7 +110,7 @@ private async Task InitializePostgres(CancellationToken cancellationToken)
 
             var cmdText = $"CREATE DATABASE {connectionStringBuilder.Database}";
 
-            Log.Information(
+            s_Log.Information(
                 "Creating database '{database}' at server '{server}' with the statement: {cmdText}",
                 connectionStringBuilder.Database,
                 connectionStringBuilder.Host,
diff --git a/src/SqlStreamStore.Server/SqlStreamStoreFactory.cs b/src/SqlStreamStore.Server/SqlStreamStoreFactory.cs
@@ -6,6 +6,8 @@ namespace SqlStreamStore.Server
 {
     internal class SqlStreamStoreFactory
     {
+        private static readonly ILogger s_Log = Log.ForContext<SqlStreamStoreFactory>();
+
         private readonly SqlStreamStoreServerConfiguration _configuration;
 
         public SqlStreamStoreFactory(SqlStreamStoreServerConfiguration configuration)
@@ -22,7 +24,7 @@ public IStreamStore Create()
         {
             var provider = _configuration.Provider;
 
-            Log.Information("Creating stream store for provider {provider}.", provider);
+            s_Log.Information("Creating stream store for provider {provider}.", provider);
 
             switch (provider)
             {
diff --git a/src/SqlStreamStore.Server/SqlStreamStoreInitializer.cs b/src/SqlStreamStore.Server/SqlStreamStoreInitializer.cs
@@ -12,6 +12,8 @@ namespace SqlStreamStore.Server
 {
     internal class SqlStreamStoreInitializer
     {
+        private static readonly ILogger s_Log = Log.ForContext<SqlStreamStoreInitializer>();
+
         private readonly SqlStreamStoreServerConfiguration _configuration;
         private readonly SqlStreamStoreFactory _streamStoreFactory;
 
@@ -37,7 +39,7 @@ public Task Initialize(CancellationToken cancellationToken = default)
                 case postgres:
                     return InitializePostgresStreamStore(cancellationToken);
                 default:
-                    Log.Warning("Provider {provider} has no initialization.", _configuration.Provider);
+                    s_Log.Warning("Provider {provider} has no initialization.", _configuration.Provider);
                     return Task.CompletedTask;
             }
         }
@@ -89,7 +91,7 @@ private async Task InitializePostgresStreamStore(CancellationToken cancellationT
 
         private static void SchemaCreationFailed(Func<string> getSchemaCreationScript, Exception ex)
         {
-            Log.Error(
+            s_Log.Error(
                 new StringBuilder()
                     .Append("Could not create schema: {ex}")
                     .AppendLine()
diff --git a/src/SqlStreamStore.Server/SqlStreamStoreServer.cs b/src/SqlStreamStore.Server/SqlStreamStoreServer.cs
@@ -9,8 +9,10 @@
 
 namespace SqlStreamStore.Server
 {
-    internal class Program : IDisposable
+    internal class SqlStreamStoreServer : IDisposable
     {
+        private static readonly ILogger s_Log = Log.ForContext<SqlStreamStoreServer>();
+
         private readonly CancellationTokenSource _cts;
         private readonly SqlStreamStoreServerConfiguration _configuration;
         private readonly SqlStreamStoreFactory _factory;
@@ -21,22 +23,24 @@ public static async Task<int> Main(string[] args)
                 Environment.GetEnvironmentVariables(),
                 args);
 
-            using (var program = new Program(configuration))
+            using (var server = new SqlStreamStoreServer(configuration))
             {
-                return await program.Run();
+                return await server.Run();
             }
         }
 
-        private Program(SqlStreamStoreServerConfiguration configuration)
+        private SqlStreamStoreServer(SqlStreamStoreServerConfiguration configuration)
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Is(configuration.LogLevel)
                 .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
                 .Enrich.FromLogContext()
-                .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}")
+                .WriteTo.Console(
+                    outputTemplate:
+                    "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}")
                 .CreateLogger();
 
-            Log.Information(configuration.ToString());
+            s_Log.Information(configuration.ToString());
 
             _configuration = configuration;
             _cts = new CancellationTokenSource();
@@ -64,7 +68,7 @@ private async Task<int> Run()
             }
             catch (Exception ex)
             {
-                Log.Fatal(ex, "Host terminated unexpectedly.");
+                s_Log.Fatal(ex, "Host terminated unexpectedly.");
                 return 1;
             }
             finally
@@ -84,7 +88,7 @@ private async Task RunServer()
                     new SqlStreamStoreMiddlewareOptions
                     {
                         UseCanonicalUrls = _configuration.UseCanonicalUris,
-                        ServerAssembly = typeof(Program).Assembly
+                        ServerAssembly = typeof(SqlStreamStoreServer).Assembly
                     }))
                 .UseSerilog()
                 .Build())

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ namespace SqlStreamStore.Server.Browser`
`11`	`11`	`{`
`12`	`12`	`internal static class SqlStreamStoreBrowserMiddleware`
`13`	`13`	`{`
	`14`	`+ private static readonly ILogger s_Log = Log.ForContext(typeof(SqlStreamStoreBrowserMiddleware));`
`14`	`15`	`public static IApplicationBuilder UseSqlStreamStoreBrowser(`
`15`	`16`	`this IApplicationBuilder builder,`
`16`	`17`	`Type rootType = default)`
`@@ -23,7 +24,7 @@ public static IApplicationBuilder UseSqlStreamStoreBrowser(`
`23`	`24`	`var staticFiles = rootType.Assembly.GetManifestResourceNames()`
`24`	`25`	`.Where(name => name.StartsWith(rootType.Namespace));`
`25`	`26`
`26`		`- Log.Debug(`
	`27`	`+ s_Log.Debug(`
`27`	`28`	`"The following embedded resources were found and will be served as static content: {staticFiles}",`
`28`	`29`	`string.Join(", ", staticFiles));`
`29`	`30`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ namespace SqlStreamStore.Server`
`6`	`6`	`{`
`7`	`7`	`internal class SqlStreamStoreFactory`
`8`	`8`	`{`
	`9`	`+ private static readonly ILogger s_Log = Log.ForContext<SqlStreamStoreFactory>();`
	`10`	`+`
`9`	`11`	`private readonly SqlStreamStoreServerConfiguration _configuration;`
`10`	`12`
`11`	`13`	`public SqlStreamStoreFactory(SqlStreamStoreServerConfiguration configuration)`
`@@ -22,7 +24,7 @@ public IStreamStore Create()`
`22`	`24`	`{`
`23`	`25`	`var provider = _configuration.Provider;`
`24`	`26`
`25`		`- Log.Information("Creating stream store for provider {provider}.", provider);`
	`27`	`+ s_Log.Information("Creating stream store for provider {provider}.", provider);`
`26`	`28`
`27`	`29`	`switch (provider)`
`28`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ namespace SqlStreamStore.Server`
`12`	`12`	`{`
`13`	`13`	`internal class SqlStreamStoreInitializer`
`14`	`14`	`{`
	`15`	`+ private static readonly ILogger s_Log = Log.ForContext<SqlStreamStoreInitializer>();`
	`16`	`+`
`15`	`17`	`private readonly SqlStreamStoreServerConfiguration _configuration;`
`16`	`18`	`private readonly SqlStreamStoreFactory _streamStoreFactory;`
`17`	`19`
`@@ -37,7 +39,7 @@ public Task Initialize(CancellationToken cancellationToken = default)`
`37`	`39`	`case postgres:`
`38`	`40`	`return InitializePostgresStreamStore(cancellationToken);`
`39`	`41`	`default:`
`40`		`- Log.Warning("Provider {provider} has no initialization.", _configuration.Provider);`
	`42`	`+ s_Log.Warning("Provider {provider} has no initialization.", _configuration.Provider);`
`41`	`43`	`return Task.CompletedTask;`
`42`	`44`	`}`
`43`	`45`	`}`
`@@ -89,7 +91,7 @@ private async Task InitializePostgresStreamStore(CancellationToken cancellationT`
`89`	`91`
`90`	`92`	`private static void SchemaCreationFailed(Func<string> getSchemaCreationScript, Exception ex)`
`91`	`93`	`{`
`92`		`- Log.Error(`
	`94`	`+ s_Log.Error(`
`93`	`95`	`new StringBuilder()`
`94`	`96`	`.Append("Could not create schema: {ex}")`
`95`	`97`	`.AppendLine()`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,10 @@`
`9`	`9`
`10`	`10`	`namespace SqlStreamStore.Server`
`11`	`11`	`{`
`12`		`- internal class Program : IDisposable`
	`12`	`+ internal class SqlStreamStoreServer : IDisposable`
`13`	`13`	`{`
	`14`	`+ private static readonly ILogger s_Log = Log.ForContext<SqlStreamStoreServer>();`
	`15`	`+`
`14`	`16`	`private readonly CancellationTokenSource _cts;`
`15`	`17`	`private readonly SqlStreamStoreServerConfiguration _configuration;`
`16`	`18`	`private readonly SqlStreamStoreFactory _factory;`
`@@ -21,22 +23,24 @@ public static async Task<int> Main(string[] args)`
`21`	`23`	`Environment.GetEnvironmentVariables(),`
`22`	`24`	`args);`
`23`	`25`
`24`		`- using (var program = new Program(configuration))`
	`26`	`+ using (var server = new SqlStreamStoreServer(configuration))`
`25`	`27`	`{`
`26`		`- return await program.Run();`
	`28`	`+ return await server.Run();`
`27`	`29`	`}`
`28`	`30`	`}`
`29`	`31`
`30`		`- private Program(SqlStreamStoreServerConfiguration configuration)`
	`32`	`+ private SqlStreamStoreServer(SqlStreamStoreServerConfiguration configuration)`
`31`	`33`	`{`
`32`	`34`	`Log.Logger = new LoggerConfiguration()`
`33`	`35`	`.MinimumLevel.Is(configuration.LogLevel)`
`34`	`36`	`.MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)`
`35`	`37`	`.Enrich.FromLogContext()`
`36`		`- .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}")`
	`38`	`+ .WriteTo.Console(`
	`39`	`+ outputTemplate:`
	`40`	`+ "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}")`
`37`	`41`	`.CreateLogger();`
`38`	`42`
`39`		`- Log.Information(configuration.ToString());`
	`43`	`+ s_Log.Information(configuration.ToString());`
`40`	`44`
`41`	`45`	`_configuration = configuration;`
`42`	`46`	`_cts = new CancellationTokenSource();`
`@@ -64,7 +68,7 @@ private async Task<int> Run()`
`64`	`68`	`}`
`65`	`69`	`catch (Exception ex)`
`66`	`70`	`{`
`67`		`- Log.Fatal(ex, "Host terminated unexpectedly.");`
	`71`	`+ s_Log.Fatal(ex, "Host terminated unexpectedly.");`
`68`	`72`	`return 1;`
`69`	`73`	`}`
`70`	`74`	`finally`
`@@ -84,7 +88,7 @@ private async Task RunServer()`
`84`	`88`	`new SqlStreamStoreMiddlewareOptions`
`85`	`89`	`{`
`86`	`90`	`UseCanonicalUrls = _configuration.UseCanonicalUris,`
`87`		`- ServerAssembly = typeof(Program).Assembly`
	`91`	`+ ServerAssembly = typeof(SqlStreamStoreServer).Assembly`
`88`	`92`	`}))`
`89`	`93`	`.UseSerilog()`
`90`	`94`	`.Build())`