improving logging experience

Author: thefringeninja

src/SqlStreamStore.Server/DatabaseInitializer.cs

@@ -42,6 +42,15 @@ public Task Initialize(CancellationToken cancellationToken = default)
         private async Task InitializeMySql(CancellationToken cancellationToken)
         {
             var connectionStringBuilder = new MySqlConnectionStringBuilder(_configuration.ConnectionString);
+
+            var cmdText = $"CREATE DATABASE IF NOT EXISTS `{connectionStringBuilder.Database}`";
+
+            Log.Information(
+                "Creating database '{database}' at server '{server}' with the statement: {cmdText}",
+                connectionStringBuilder.Database,
+                connectionStringBuilder.Server,
+                cmdText);
+
             using (var connection = new MySqlConnection(
                 new MySqlConnectionStringBuilder(_configuration.ConnectionString)
                 {
@@ -51,7 +60,7 @@ private async Task InitializeMySql(CancellationToken cancellationToken)
                 await connection.OpenAsync(cancellationToken).NotOnCapturedContext();
 
                 using (var command = new MySqlCommand(
-                    $"CREATE DATABASE IF NOT EXISTS `{connectionStringBuilder.Database}`",
+                    cmdText,
                     connection))
                 {
                     await command.ExecuteNonQueryAsync(cancellationToken).NotOnCapturedContext();
@@ -62,6 +71,19 @@ private async Task InitializeMySql(CancellationToken cancellationToken)
         private async Task InitializeMsSql(CancellationToken cancellationToken)
         {
             var connectionStringBuilder = new SqlConnectionStringBuilder(_configuration.ConnectionString);
+
+            var cmdText = $@"
+IF  NOT EXISTS (SELECT name FROM sys.databases WHERE name = N'{connectionStringBuilder.InitialCatalog}')
+BEGIN
+    CREATE DATABASE [{connectionStringBuilder.InitialCatalog}]
+END;
+";
+            Log.Information(
+                "Creating database '{database}' at server '{server}' with the statement: {cmdText}",
+                connectionStringBuilder.InitialCatalog,
+                connectionStringBuilder.DataSource,
+                cmdText);
+
             using (var connection = new SqlConnection(
                 new SqlConnectionStringBuilder(_configuration.ConnectionString)
                 {
@@ -71,12 +93,7 @@ private async Task InitializeMsSql(CancellationToken cancellationToken)
                 await connection.OpenAsync(cancellationToken).NotOnCapturedContext();
 
                 using (var command = new SqlCommand(
-                    $@"
-IF  NOT EXISTS (SELECT name FROM sys.databases WHERE name = N'{connectionStringBuilder.InitialCatalog}')
-BEGIN
-    CREATE DATABASE [{connectionStringBuilder.InitialCatalog}]
-END;
-",
+                    cmdText,
                     connection))
                 {
                     await command.ExecuteNonQueryAsync(cancellationToken).NotOnCapturedContext();
@@ -87,6 +104,15 @@ CREATE DATABASE [{connectionStringBuilder.InitialCatalog}]
         private async Task InitializePostgres(CancellationToken cancellationToken)
         {
             var connectionStringBuilder = new NpgsqlConnectionStringBuilder(_configuration.ConnectionString);
+
+            var cmdText = $"CREATE DATABASE {connectionStringBuilder.Database}";
+
+            Log.Information(
+                "Creating database '{database}' at server '{server}' with the statement: {cmdText}",
+                connectionStringBuilder.Database,
+                connectionStringBuilder.Host,
+                cmdText);
+
             using (var connection = new NpgsqlConnection(
                 new NpgsqlConnectionStringBuilder(_configuration.ConnectionString)
                 {
@@ -109,7 +135,7 @@ async Task<bool> DatabaseExists()
                 if (!await DatabaseExists())
                 {
                     using (var command = new NpgsqlCommand(
-                        $"CREATE DATABASE {connectionStringBuilder.Database}",
+                        cmdText,
                         connection))
                     {
                         await command.ExecuteNonQueryAsync(cancellationToken).NotOnCapturedContext();

src/SqlStreamStore.Server/SqlStreamStoreInitializer.cs

@@ -3,6 +3,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using MySql.Data.MySqlClient;
 using Npgsql;
 using Serilog;
 using static SqlStreamStore.Server.Constants;
@@ -49,10 +50,9 @@ private async Task InitializeMySqlStreamStore(CancellationToken cancellationToke
                 {
                     await streamStore.CreateSchemaIfNotExists(cancellationToken);
                 }
-                catch (SqlException ex)
+                catch (MySqlException ex)
                 {
                     SchemaCreationFailed(streamStore.GetSchemaCreationScript, ex);
-                    throw;
                 }
             }
         }
@@ -68,7 +68,6 @@ private async Task InitializeMsSqlStreamStore(CancellationToken cancellationToke
                 catch (SqlException ex)
                 {
                     SchemaCreationFailed(streamStore.GetSchemaCreationScript, ex);
-                    throw;
                 }
             }
         }
@@ -84,13 +83,13 @@ private async Task InitializePostgresStreamStore(CancellationToken cancellationT
                 catch (NpgsqlException ex)
                 {
                     SchemaCreationFailed(streamStore.GetSchemaCreationScript, ex);
-                    throw;
                 }
             }
         }
 
         private static void SchemaCreationFailed(Func<string> getSchemaCreationScript, Exception ex)
-            => Log.Error(
+        {
+            Log.Error(
                 new StringBuilder()
                     .Append("Could not create schema: {ex}")
                     .AppendLine()
@@ -101,5 +100,7 @@ private static void SchemaCreationFailed(Func<string> getSchemaCreationScript, E
                     .ToString(),
                 ex,
                 getSchemaCreationScript());
+            Environment.Exit(1);
+        }
     }
 }