Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit dbec551

Browse files
committed
Refactor: Structured logging.
1 parent f00a9a9 commit dbec551

File tree

12 files changed

+98
-462
lines changed

12 files changed

+98
-462
lines changed

‎src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbBatchCommand.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
using System.Collections.Generic;
2020
using System.ComponentModel;
2121
using System.Data;
22-
using System.Data.Common;
23-
using System.Text;
2422
using System.Threading;
2523
using System.Threading.Tasks;
2624
using FirebirdSql.Data.Common;
2725
using FirebirdSql.Data.Logging;
26+
using Microsoft.Extensions.Logging;
2827

2928
namespace FirebirdSql.Data.FirebirdClient;
3029

@@ -33,7 +32,7 @@ public sealed class FbBatchCommand : IFbPreparedCommand, IDescriptorFiller, IDis
3332
, IAsyncDisposable
3433
#endif
3534
{
36-
static readonly IFbLogger Log = FbLogManager.CreateLogger(nameof(FbBatchCommand));
35+
static readonly ILogger<FbBatchCommand> Log = FbLogManager.CreateLogger<FbBatchCommand>();
3736

3837
private const int DefaultBatchBufferSize = 16 * 1024 * 1024;
3938

‎src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommand.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@
2525
using System.Threading.Tasks;
2626
using FirebirdSql.Data.Common;
2727
using FirebirdSql.Data.Logging;
28+
using Microsoft.Extensions.Logging;
2829

2930
namespace FirebirdSql.Data.FirebirdClient;
3031

3132
public sealed class FbCommand : DbCommand, IFbPreparedCommand, IDescriptorFiller, ICloneable
3233
{
33-
static readonly IFbLogger Log = FbLogManager.CreateLogger(nameof(FbCommand));
34+
static readonly ILogger<FbCommand> Log = FbLogManager.CreateLogger<FbCommand>();
3435

3536
#region Fields
3637

‎src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnection.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
using System.Threading.Tasks;
2424
using FirebirdSql.Data.Common;
2525
using FirebirdSql.Data.Logging;
26+
using Microsoft.Extensions.Logging;
2627

2728
namespace FirebirdSql.Data.FirebirdClient;
2829

2930
[DefaultEvent("InfoMessage")]
3031
public sealed class FbConnection : DbConnection, ICloneable
3132
{
32-
static readonly IFbLogger Log = FbLogManager.CreateLogger(nameof(FbConnection));
33+
static readonly ILogger<FbConnection> Log = FbLogManager.CreateLogger<FbConnection>();
3334

3435
#region Static Pool Handling Methods
3536

‎src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbTransaction.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222
using System.Threading.Tasks;
2323
using FirebirdSql.Data.Common;
2424
using FirebirdSql.Data.Logging;
25+
using Microsoft.Extensions.Logging;
2526

2627
namespace FirebirdSql.Data.FirebirdClient;
2728

2829
public sealed class FbTransaction : DbTransaction
2930
{
30-
static readonly IFbLogger Log = FbLogManager.CreateLogger(nameof(FbTransaction));
31+
static readonly ILogger<FbTransaction> Log = FbLogManager.CreateLogger<FbTransaction>();
3132

3233
internal const IsolationLevel DefaultIsolationLevel = IsolationLevel.ReadCommitted;
3334

‎src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<PrivateAssets>all</PrivateAssets>
6262
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6363
</PackageReference>
64+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
6465
</ItemGroup>
6566
<ItemGroup>
6667
<Compile Update="FirebirdClient\FbBatchCommand.cs" />

‎src/FirebirdSql.Data.FirebirdClient/Logging/ConsoleLoggingProvider.cs‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎src/FirebirdSql.Data.FirebirdClient/Logging/FbLogLevel.cs‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/FirebirdSql.Data.FirebirdClient/Logging/FbLogManager.cs‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,26 @@
1515

1616
//$Authors = Jiri Cincura (jiri@cincura.net)
1717

18-
using System;
18+
using Microsoft.Extensions.Logging.Abstractions;
19+
using Microsoft.Extensions.Logging;
1920

2021
namespace FirebirdSql.Data.Logging;
2122

2223
public static class FbLogManager
2324
{
24-
public static IFbLoggingProvider Provider
25-
{
26-
get
27-
{
28-
_providerRetrieved = true;
29-
return _provider;
30-
}
31-
set
32-
{
33-
if (_providerRetrieved)
34-
throw new InvalidOperationException("The logging provider must be set before any action is taken");
25+
internal static ILoggerFactory LoggerFactory = NullLoggerFactory.Instance;
26+
internal static bool IsParameterLoggingEnabled = false;
3527

36-
_provider = value ?? throw new ArgumentNullException(nameof(value));
37-
}
28+
public static void UseLoggerFactory(ILoggerFactory loggerFactory)
29+
{
30+
LoggerFactory = loggerFactory;
3831
}
3932

40-
public static bool IsParameterLoggingEnabled { get; set; }
41-
42-
static IFbLoggingProvider _provider;
43-
static bool _providerRetrieved;
44-
45-
static FbLogManager()
33+
public static void EnableParameterLogging(bool enable = true)
4634
{
47-
_provider = newNullLoggingProvider();
35+
IsParameterLoggingEnabled = enable;
4836
}
4937

50-
internal static IFbLogger CreateLogger(string name) => Provider.CreateLogger("FirebirdClient." + name);
38+
internal static ILogger<T> CreateLogger<T>() =>
39+
LoggerFactory.CreateLogger<T>();
5140
}

‎src/FirebirdSql.Data.FirebirdClient/Logging/IFbLogger.cs‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎src/FirebirdSql.Data.FirebirdClient/Logging/IFbLoggingProvider.cs‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /