Removed failurecallback option.

SeppPenner · SeppPenner · commit 06d4f4b8901d · 2025-03-27T11:04:25.000+01:00
diff --git a/src/Serilog.Sinks.Postgresql.Alternative.IntegrationTests/DbWriteTests.cs b/src/Serilog.Sinks.Postgresql.Alternative.IntegrationTests/DbWriteTests.cs
@@ -445,8 +445,7 @@ public async Task TestIssue32()
             TableName,
             columnProps,
             needAutoCreateTable: true,
-            needAutoCreateSchema: true,
-            failureCallback: e => Console.WriteLine($"Sink error: {e.Message}")
+            needAutoCreateSchema: true
           ).CreateLogger();
 
         LogContext.PushProperty("UserName", "Hans");
@@ -483,8 +482,7 @@ public async Task TestIssue52()
             TableName,
             columnProps,
             needAutoCreateTable: true,
-            needAutoCreateSchema: true,
-            failureCallback: e => Console.WriteLine($"Sink error: {e.Message}")
+            needAutoCreateSchema: true
           ).CreateLogger();
 
         LogContext.PushProperty("EnumTest", DummyEnum.Test1);
diff --git a/src/Serilog.Sinks.Postgresql.Alternative.IntegrationTests/JsonConfigTestNamedConnectionString.cs b/src/Serilog.Sinks.Postgresql.Alternative.IntegrationTests/JsonConfigTestNamedConnectionString.cs
@@ -54,7 +54,6 @@ public async Task ShouldCreateLoggerFromConfig()
             string.Empty,
             true,
             false,
-            null,
             configuration).CreateLogger();
 
         const long RowsCount = 2;
diff --git a/src/Serilog.Sinks.Postgresql.Alternative/LoggerConfigurationPostgreSQLExtensions.cs b/src/Serilog.Sinks.Postgresql.Alternative/LoggerConfigurationPostgreSQLExtensions.cs
@@ -55,7 +55,6 @@ private static readonly IMicrosoftExtensionsConnectionStringProvider MicrosoftEx
     /// <param name="schemaName">The schema name.</param>
     /// <param name="needAutoCreateTable">A <seealso cref="bool"/> value indicating whether the table should be auto created or not.</param>
     /// <param name="needAutoCreateSchema">Specifies whether the schema should be auto-created if it does not already exist or not.</param>
-    /// <param name="failureCallback">The failure callback.</param>
     /// <param name="appConfiguration">The app configuration section. Required if the connection string is a name.</param>
     /// <param name="onCreateTableCallback">The on create table callback.</param>
     /// <param name="onCreateSchemaCallback">The on create schema callback.</param>
@@ -76,7 +75,6 @@ public static LoggerConfiguration PostgreSQL(
         string schemaName = "",
         bool needAutoCreateTable = false,
         bool needAutoCreateSchema = false,
-        Action<Exception>? failureCallback = null,
         IConfiguration? appConfiguration = null,
         Action<CreateTableEventArgs>? onCreateTableCallback = null,
         Action<CreateSchemaEventArgs>? onCreateSchemaCallback = null,
@@ -107,7 +105,6 @@ public static LoggerConfiguration PostgreSQL(
             schemaName,
             needAutoCreateTable,
             needAutoCreateSchema,
-            failureCallback,
             onCreateTableCallback,
             onCreateSchemaCallback,
             retentionTime);
@@ -140,7 +137,6 @@ public static LoggerConfiguration PostgreSQL(
     /// <param name="schemaName">The schema name.</param>
     /// <param name="needAutoCreateTable">A <seealso cref="bool"/> value indicating whether the table should be auto created or not.</param>
     /// <param name="needAutoCreateSchema">Specifies whether the schema should be auto-created if it does not already exist or not.</param>
-    /// <param name="failureCallback">The failure callback.</param>
     /// <param name="appConfiguration">The app configuration section. Required if the connection string is a name.</param>
     /// <param name="onCreateTableCallback">The on create table callback.</param>
     /// <param name="onCreateSchemaCallback">The on create schema callback.</param>
@@ -162,7 +158,6 @@ public static LoggerConfiguration PostgreSQL(
         string schemaName = "",
         bool needAutoCreateTable = false,
         bool needAutoCreateSchema = false,
-        Action<Exception>? failureCallback = null,
         IConfiguration? appConfiguration = null,
         Action<CreateTableEventArgs>? onCreateTableCallback = null,
         Action<CreateSchemaEventArgs>? onCreateSchemaCallback = null,
@@ -238,7 +233,6 @@ public static LoggerConfiguration PostgreSQL(
                 schemaName,
                 needAutoCreateTable,
                 needAutoCreateSchema,
-                failureCallback,
                 onCreateTableCallback,
                 onCreateSchemaCallback,
                 retentionTime);
@@ -272,7 +266,6 @@ public static LoggerConfiguration PostgreSQL(
             schemaName,
             needAutoCreateTable,
             needAutoCreateSchema,
-            failureCallback,
             onCreateTableCallback,
             onCreateSchemaCallback);
 
@@ -300,7 +293,6 @@ public static LoggerConfiguration PostgreSQL(
     /// <param name="schemaName">The schema name.</param>
     /// <param name="needAutoCreateTable">A <seealso cref="bool"/> value indicating whether the table should be auto created or not.</param>
     /// <param name="needAutoCreateSchema">Specifies whether the schema should be auto-created if it does not already exist or not.</param>
-    /// <param name="failureCallback">The failure callback.</param>
     /// <param name="appConfiguration">The app configuration section. Required if the connection string is a name.</param>
     /// <param name="onCreateTableCallback">The on create table callback.</param>
     /// <param name="onCreateSchemaCallback">The on create schema callback.</param>
@@ -317,7 +309,6 @@ public static LoggerConfiguration PostgreSQL(
         string schemaName = "",
         bool needAutoCreateTable = false,
         bool needAutoCreateSchema = false,
-        Action<Exception>? failureCallback = null,
         IConfiguration? appConfiguration = null,
         Action<CreateTableEventArgs>? onCreateTableCallback = null,
         Action<CreateSchemaEventArgs>? onCreateSchemaCallback = null,
@@ -346,7 +337,6 @@ public static LoggerConfiguration PostgreSQL(
             schemaName,
             needAutoCreateTable,
             needAutoCreateSchema,
-            failureCallback,
             onCreateTableCallback,
             onCreateSchemaCallback,
             retentionTime);
@@ -391,7 +381,6 @@ internal static IDictionary<string, ColumnWriterBase> ClearQuotationMarksFromCol
     /// <param name="schemaName">The schema name.</param>
     /// <param name="needAutoCreateTable">A <seealso cref="bool"/> value indicating whether the table should be auto created or not.</param>
     /// <param name="needAutoCreateSchema">Specifies whether the schema should be auto-created if it does not already exist or not.</param>
-    /// <param name="failureCallback">The failure callback.</param>
     /// <param name="appConfiguration">The app configuration section. Required if the connection string is a name.</param>
     /// <param name="onCreateTableCallback">The on create table callback.</param>
     /// <param name="onCreateSchemaCallback">The on create schema callback.</param>
@@ -409,7 +398,6 @@ public static LoggerConfiguration PostgreSQL(
         string schemaName = "",
         bool needAutoCreateTable = false,
         bool needAutoCreateSchema = false,
-        Action<Exception>? failureCallback = null,
         IConfiguration? appConfiguration = null,
         Action<CreateTableEventArgs>? onCreateTableCallback = null,
         Action<CreateSchemaEventArgs>? onCreateSchemaCallback = null,
@@ -483,7 +471,6 @@ public static LoggerConfiguration PostgreSQL(
                 schemaName,
                 needAutoCreateTable,
                 needAutoCreateSchema,
-                failureCallback,
                 onCreateTableCallback,
                 onCreateSchemaCallback,
                 retentionTime);
@@ -510,7 +497,6 @@ public static LoggerConfiguration PostgreSQL(
             schemaName,
             needAutoCreateTable,
             needAutoCreateSchema,
-            failureCallback,
             onCreateTableCallback,
             onCreateSchemaCallback,
             retentionTime);
@@ -532,7 +518,6 @@ public static LoggerConfiguration PostgreSQL(
     /// <param name="schemaName">The schema name.</param>
     /// <param name="needAutoCreateTable">A <seealso cref="bool"/> value indicating whether the table should be auto created or not.</param>
     /// <param name="needAutoCreateSchema">Specifies whether the schema should be auto-created if it does not already exist or not.</param>
-    /// <param name="failureCallback">The failure callback.</param>
     /// <param name="onCreateTableCallback">The on create table callback.</param>
     /// <param name="onCreateSchemaCallback">The on create schema callback.</param>
     /// <param name="retentionTime">The retention time of the log entries in the database.</param>
@@ -548,14 +533,12 @@ internal static PostgreSqlOptions GetOptions(
         string schemaName,
         bool needAutoCreateTable,
         bool needAutoCreateSchema,
-        Action<Exception>? failureCallback,
         Action<CreateTableEventArgs>? onCreateTableCallback,
         Action<CreateSchemaEventArgs>? onCreateSchemaCallback,
         TimeSpan? retentionTime = null)
     {
         var columnOptionsLocal = ClearQuotationMarksFromColumnOptions(columnOptions ?? ColumnOptions.Default);
 
-#pragma warning disable CS0618 // Typ oder Element ist veraltet
         return new PostgreSqlOptions
         {
             ConnectionString = connectionString,
@@ -569,12 +552,9 @@ internal static PostgreSqlOptions GetOptions(
             SchemaName = schemaName.Replace("\"", string.Empty),
             NeedAutoCreateTable = needAutoCreateTable,
             NeedAutoCreateSchema = needAutoCreateSchema,
-            // Todo: Remove this in next version!
-            FailureCallback = failureCallback,
             OnCreateTable = onCreateTableCallback,
             OnCreateSchema = onCreateSchemaCallback,
             RetentionTime = retentionTime
         };
-#pragma warning restore CS0618 // Typ oder Element ist veraltet
     }
 }
diff --git a/src/Serilog.Sinks.Postgresql.Alternative/Sinks/PostgreSQL/PostgreSQLOptions.cs b/src/Serilog.Sinks.Postgresql.Alternative/Sinks/PostgreSQL/PostgreSQLOptions.cs
@@ -39,12 +39,6 @@ public sealed class PostgreSqlOptions
     /// </summary>
     public bool UseCopy { get; set; }
 
-    /// <summary>
-    ///  Gets or sets the failure callback.
-    /// </summary>
-    [Obsolete("Use fallback logging instead. Check https://nblumhardt.com/2024/10/fallback-logging/.")]
-    public Action<Exception>? FailureCallback { get; set; }
-
     /// <summary>
     ///     Gets or sets the column options.
     /// </summary>
diff --git a/src/Serilog.Sinks.Postgresql.Alternative/Sinks/PostgreSQL/PostgreSQLSink.cs b/src/Serilog.Sinks.Postgresql.Alternative/Sinks/PostgreSQL/PostgreSQLSink.cs
@@ -44,18 +44,7 @@ public PostgreSqlSink(PostgreSqlOptions options)
     /// </remarks>
     public async Task EmitBatchAsync(IReadOnlyCollection<LogEvent> events)
     {
-        try
-        {
-            await this.sinkHelper.Emit(events);
-        }
-        catch (Exception ex)
-        {
-            // Todo: Remove this in next version!
-#pragma warning disable CS0618 // Typ oder Element ist veraltet
-            this.sinkHelper.SinkOptions.FailureCallback?.Invoke(ex);
-#pragma warning restore CS0618 // Typ oder Element ist veraltet
-            throw;
-        }
+        await this.sinkHelper.Emit(events);
     }
 
     /// <inheritdoc cref="IBatchedLogEventSink" />
