Skip to content

Commit 01f863e

Browse files
committed
Update NHibernate.Example.Web to use new INHibernateLoggerFactory.
1 parent dc2dc22 commit 01f863e

File tree

2 files changed

+39
-76
lines changed

2 files changed

+39
-76
lines changed

src/NHibernate.Example.Web/Infrastructure/NHibernateToMicrosoftLogger.cs

Lines changed: 35 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace NHibernate.Example.Web.Infrastructure
55
{
6-
public class NHibernateToMicrosoftLogger : IInternalLogger
6+
public class NHibernateToMicrosoftLogger : IInternalLogger2
77
{
88
private readonly ILogger _msLogger;
99

@@ -12,116 +12,79 @@ public NHibernateToMicrosoftLogger(ILogger msLogger)
1212
_msLogger = msLogger ?? throw new ArgumentNullException(nameof(msLogger));
1313
}
1414

15-
public void Error(object message)
15+
public void Fatal(Exception exception, string format, params object[] args)
1616
{
17-
if (IsErrorEnabled)
18-
{
19-
_msLogger.LogError(message.ToString());
20-
}
17+
_msLogger.LogCritical(exception, format, args);
2118
}
2219

23-
public void Error(object message, Exception exception)
20+
public void Fatal(string format, params object[] args)
2421
{
25-
if (IsErrorEnabled)
26-
{
27-
_msLogger.LogError(exception, message.ToString());
28-
}
22+
_msLogger.LogCritical(format, args);
2923
}
3024

31-
public void ErrorFormat(string format, params object[] args)
25+
public void Error(Exception exception, string format, params object[] args)
3226
{
33-
if (IsErrorEnabled)
34-
{
35-
_msLogger.LogError(format, args);
36-
}
27+
_msLogger.LogError(exception, format, args);
3728
}
3829

39-
public void Fatal(object message)
30+
public void Error(string format, params object[] args)
4031
{
41-
if (IsFatalEnabled)
42-
{
43-
_msLogger.LogCritical(message.ToString());
44-
}
32+
_msLogger.LogError(format, args);
4533
}
4634

47-
public void Fatal(object message, Exception exception)
35+
public void Warn(Exception exception, string format, params object[] args)
4836
{
49-
if (IsFatalEnabled)
50-
{
51-
_msLogger.LogCritical(exception, message.ToString());
52-
}
37+
_msLogger.LogWarning(exception, format, args);
5338
}
5439

55-
public void Debug(object message)
40+
public void Warn(string format, params object[] args)
5641
{
57-
if (IsDebugEnabled)
58-
{
59-
_msLogger.LogDebug(message.ToString());
60-
}
42+
_msLogger.LogWarning(format, args);
6143
}
6244

63-
public void Debug(object message, Exception exception)
45+
public void Info(Exception exception, string format, params object[] args)
6446
{
65-
if (IsDebugEnabled)
66-
{
67-
_msLogger.LogDebug(exception, message.ToString());
68-
}
47+
_msLogger.LogInformation(exception, format, args);
6948
}
7049

71-
public void DebugFormat(string format, params object[] args)
50+
public void Info(string format, params object[] args)
7251
{
73-
if (IsDebugEnabled)
74-
{
75-
_msLogger.LogDebug(format, args);
76-
}
52+
_msLogger.LogInformation(format, args);
7753
}
7854

79-
public void Info(object message)
55+
public void Debug(Exception exception, string format, params object[] args)
8056
{
81-
if (IsInfoEnabled)
82-
{
83-
_msLogger.LogInformation(message.ToString());
84-
}
57+
_msLogger.LogDebug(exception, format, args);
8558
}
8659

87-
public void Info(object message, Exception exception)
60+
public void Debug(string format, params object[] args)
8861
{
89-
if (IsInfoEnabled)
90-
{
91-
_msLogger.LogInformation(exception, message.ToString());
92-
}
62+
_msLogger.LogDebug(format, args);
9363
}
9464

95-
public void InfoFormat(string format, params object[] args)
65+
public void Fatal(string message, Exception ex)
9666
{
97-
if (IsInfoEnabled)
98-
{
99-
_msLogger.LogInformation(format, args);
100-
}
67+
throw new NotImplementedException();
10168
}
10269

103-
public void Warn(object message)
70+
public void Error(string message, Exception ex)
10471
{
105-
if (IsWarnEnabled)
106-
{
107-
_msLogger.LogWarning(message.ToString());
108-
}
72+
throw new NotImplementedException();
10973
}
11074

111-
public void Warn(object message, Exception exception)
75+
public void Warn(string message, Exception ex)
11276
{
113-
if (IsWarnEnabled)
114-
{
115-
_msLogger.LogWarning(exception, message.ToString());
116-
}
77+
throw new NotImplementedException();
11778
}
11879

119-
public void WarnFormat(string format, params object[] args)
80+
public void Info(string message, Exception ex)
12081
{
121-
if (IsWarnEnabled)
122-
{
123-
_msLogger.LogWarning(format, args);
124-
}
82+
throw new NotImplementedException();
83+
}
84+
85+
public void Debug(string message, Exception ex)
86+
{
87+
throw new NotImplementedException();
12588
}
12689

12790
public bool IsErrorEnabled => _msLogger.IsEnabled(LogLevel.Error);
@@ -130,4 +93,4 @@ public void WarnFormat(string format, params object[] args)
13093
public bool IsInfoEnabled => _msLogger.IsEnabled(LogLevel.Information);
13194
public bool IsWarnEnabled => _msLogger.IsEnabled(LogLevel.Warning);
13295
}
133-
}
96+
}

src/NHibernate.Example.Web/Infrastructure/NHibernateToMicrosoftLoggerFactory.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace NHibernate.Example.Web.Infrastructure
44
{
5-
public class NHibernateToMicrosoftLoggerFactory : NHibernate.ILoggerFactory
5+
public class NHibernateToMicrosoftLoggerFactory : INHibernateLoggerFactory
66
{
77
private readonly Microsoft.Extensions.Logging.ILoggerFactory _loggerFactory;
88

@@ -11,16 +11,16 @@ public NHibernateToMicrosoftLoggerFactory(Microsoft.Extensions.Logging.ILoggerFa
1111
_loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
1212
}
1313

14-
public IInternalLogger LoggerFor(string keyName)
14+
public IInternalLogger2 LoggerFor(string keyName)
1515
{
1616
var msLogger = _loggerFactory.CreateLogger(keyName);
1717
return new NHibernateToMicrosoftLogger(msLogger);
1818
}
1919

20-
public IInternalLogger LoggerFor(System.Type type)
20+
public IInternalLogger2 LoggerFor(System.Type type)
2121
{
2222
return LoggerFor(
2323
Microsoft.Extensions.Logging.Abstractions.Internal.TypeNameHelper.GetTypeDisplayName(type));
2424
}
2525
}
26-
}
26+
}

0 commit comments

Comments
 (0)