Skip to content

Commit a9dcc27

Browse files
committed
Make NHibernateLogger static.
1 parent da77cf3 commit a9dcc27

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

src/NHibernate/Logging.cs

+5-11
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@ public interface INHibernateLoggerFactory
4747
/// By default, it will use a <see cref="Log4NetLoggerFactory"/> if log4net is available, otherwise it will
4848
/// use a <see cref="NoLoggingNHibernateLoggerFactory"/>.
4949
/// </remarks>
50-
public class NHibernateLogger
50+
public static class NHibernateLogger
5151
{
5252
private const string nhibernateLoggerConfKey = "nhibernate-logger";
53-
private readonly INHibernateLoggerFactory _loggerFactory;
54-
private static NHibernateLogger _instance;
53+
private static INHibernateLoggerFactory _loggerFactory;
5554

5655
static NHibernateLogger()
5756
{
@@ -66,7 +65,7 @@ static NHibernateLogger()
6665
/// <param name="loggerFactory">A logger factory.</param>
6766
public static void SetLoggersFactory(INHibernateLoggerFactory loggerFactory)
6867
{
69-
_instance = new NHibernateLogger(loggerFactory ?? new NoLoggingNHibernateLoggerFactory());
68+
_loggerFactory = loggerFactory ?? new NoLoggingNHibernateLoggerFactory();
7069

7170
#pragma warning disable 618
7271
if (!(loggerFactory is LoggerProvider.LegacyLoggerFactoryAdaptor))
@@ -76,19 +75,14 @@ public static void SetLoggersFactory(INHibernateLoggerFactory loggerFactory)
7675
#pragma warning restore 618
7776
}
7877

79-
private NHibernateLogger(INHibernateLoggerFactory loggerFactory)
80-
{
81-
_loggerFactory = loggerFactory;
82-
}
83-
8478
/// <summary>
8579
/// Get a logger for the given log key.
8680
/// </summary>
8781
/// <param name="keyName">The log key.</param>
8882
/// <returns>A NHibernate logger.</returns>
8983
public static INHibernateLogger For(string keyName)
9084
{
91-
return _instance._loggerFactory.LoggerFor(keyName);
85+
return _loggerFactory.LoggerFor(keyName);
9286
}
9387

9488
/// <summary>
@@ -98,7 +92,7 @@ public static INHibernateLogger For(string keyName)
9892
/// <returns>A NHibernate logger.</returns>
9993
public static INHibernateLogger For(System.Type type)
10094
{
101-
return _instance._loggerFactory.LoggerFor(type);
95+
return _loggerFactory.LoggerFor(type);
10296
}
10397

10498
private static string GetNhibernateLoggerClass()

0 commit comments

Comments
 (0)