Skip to content

Commit 4098d57

Browse files
committed
Updates to ILogger, see aspnet/Logging#3
1 parent 0158043 commit 4098d57

File tree

12 files changed

+47
-23
lines changed

12 files changed

+47
-23
lines changed

src/EntityFramework.Migrations/Infrastructure/MigratorLoggerExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public static void CreatingHistoryTable([NotNull] this ILogger logger)
1313
{
1414
Check.NotNull(logger, "logger");
1515

16-
logger.WriteCore(TraceType.Information, MigratorLoggerEventIds.CreatingHistoryTable, null, null,
16+
logger.Write(TraceType.Information, MigratorLoggerEventIds.CreatingHistoryTable, null, null,
1717
(_, __) => Strings.MigratorLoggerCreatingHistoryTable);
1818
}
1919

2020
public static void DroppingHistoryTable([NotNull] this ILogger logger)
2121
{
2222
Check.NotNull(logger, "logger");
2323

24-
logger.WriteCore(TraceType.Information, MigratorLoggerEventIds.DroppingHistoryTable, null, null,
24+
logger.Write(TraceType.Information, MigratorLoggerEventIds.DroppingHistoryTable, null, null,
2525
(_, __) => Strings.MigratorLoggerDroppingHistoryTable);
2626
}
2727

@@ -30,7 +30,7 @@ public static void ApplyingMigration([NotNull] this ILogger logger, [NotNull] st
3030
Check.NotNull(logger, "logger");
3131
Check.NotEmpty(migrationId, "migrationId");
3232

33-
logger.WriteCore(TraceType.Information, MigratorLoggerEventIds.ApplyingMigration, migrationId, null,
33+
logger.Write(TraceType.Information, MigratorLoggerEventIds.ApplyingMigration, migrationId, null,
3434
(o, _) => Strings.FormatMigratorLoggerApplyingMigration(o));
3535
}
3636

@@ -39,7 +39,7 @@ public static void RevertingMigration([NotNull] this ILogger logger, [NotNull] s
3939
Check.NotNull(logger, "logger");
4040
Check.NotEmpty(migrationId, "migrationId");
4141

42-
logger.WriteCore(TraceType.Information, MigratorLoggerEventIds.RevertingMigration, migrationId, null,
42+
logger.Write(TraceType.Information, MigratorLoggerEventIds.RevertingMigration, migrationId, null,
4343
(o, _) => Strings.FormatMigratorLoggerRevertingMigration(o));
4444
}
4545
}

src/EntityFramework.Relational/RelationalLoggerExtensions.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ public static void WriteSql([NotNull] this ILogger logger, [NotNull] string sql)
1717
Check.NotNull(logger, "logger");
1818
Check.NotEmpty(sql, "sql");
1919

20-
logger.WriteCore(TraceType.Verbose, RelationalLoggingEventIds.Sql, sql, null, (o, _) => (string)o);
20+
logger.Write(TraceType.Verbose, RelationalLoggingEventIds.Sql, sql, null, (o, _) => (string)o);
2121
}
2222

2323
public static void CreatingDatabase([NotNull] this ILogger logger, [NotNull] string databaseName)
2424
{
2525
Check.NotNull(logger, "logger");
2626
Check.NotEmpty(databaseName, "databaseName");
2727

28-
logger.WriteCore(TraceType.Information, RelationalLoggingEventIds.CreatingDatabase, databaseName, null,
28+
logger.Write(TraceType.Information, RelationalLoggingEventIds.CreatingDatabase, databaseName, null,
2929
(o, _) => Strings.FormatRelationalLoggerCreatingDatabase(databaseName));
3030
}
3131

@@ -34,7 +34,7 @@ public static void OpeningConnection([NotNull] this ILogger logger, [NotNull] st
3434
Check.NotNull(logger, "logger");
3535
Check.NotEmpty(connectionString, "connectionString");
3636

37-
logger.WriteCore(TraceType.Verbose, RelationalLoggingEventIds.OpeningConnection, connectionString, null,
37+
logger.Write(TraceType.Verbose, RelationalLoggingEventIds.OpeningConnection, connectionString, null,
3838
(o, _) => Strings.FormatRelationalLoggerOpeningConnection(o));
3939
}
4040

@@ -43,31 +43,31 @@ public static void ClosingConnection([NotNull] this ILogger logger, [NotNull] st
4343
Check.NotNull(logger, "logger");
4444
Check.NotEmpty(connectionString, "connectionString");
4545

46-
logger.WriteCore(TraceType.Verbose, RelationalLoggingEventIds.ClosingConnection, connectionString, null,
46+
logger.Write(TraceType.Verbose, RelationalLoggingEventIds.ClosingConnection, connectionString, null,
4747
(o, _) => Strings.FormatRelationalLoggerClosingConnection(o));
4848
}
4949

5050
public static void BeginningTransaction([NotNull] this ILogger logger, IsolationLevel isolationLevel)
5151
{
5252
Check.NotNull(logger, "logger");
5353

54-
logger.WriteCore(TraceType.Verbose, RelationalLoggingEventIds.BeginningTransaction, isolationLevel.ToString("G"), null,
54+
logger.Write(TraceType.Verbose, RelationalLoggingEventIds.BeginningTransaction, isolationLevel.ToString("G"), null,
5555
(o, _) => Strings.FormatRelationalLoggerBeginningTransaction(o));
5656
}
5757

5858
public static void CommittingTransaction([NotNull] this ILogger logger)
5959
{
6060
Check.NotNull(logger, "logger");
6161

62-
logger.WriteCore(TraceType.Verbose, RelationalLoggingEventIds.CommittingTransaction, null, null,
62+
logger.Write(TraceType.Verbose, RelationalLoggingEventIds.CommittingTransaction, null, null,
6363
(_, __) => Strings.RelationalLoggerCommittingTransaction);
6464
}
6565

6666
public static void RollingbackTransaction([NotNull] this ILogger logger)
6767
{
6868
Check.NotNull(logger, "logger");
6969

70-
logger.WriteCore(TraceType.Verbose, RelationalLoggingEventIds.RollingbackTransaction, null, null,
70+
logger.Write(TraceType.Verbose, RelationalLoggingEventIds.RollingbackTransaction, null, null,
7171
(_, __) => Strings.RelationalLoggerRollingbackTransaction);
7272
}
7373
}

src/EntityFramework/DbContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public virtual int SaveChanges()
132132
}
133133
catch (Exception ex)
134134
{
135-
_logger.Value.WriteCore(
135+
_logger.Value.Write(
136136
TraceType.Error,
137137
0,
138138
new DataStoreErrorLogState(GetType()),
@@ -157,7 +157,7 @@ public virtual int SaveChanges()
157157
}
158158
catch (Exception ex)
159159
{
160-
_logger.Value.WriteCore(
160+
_logger.Value.Write(
161161
TraceType.Error,
162162
0,
163163
new DataStoreErrorLogState(GetType()),

src/EntityFramework/Query/EntityQueryExecutor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public bool MoveNext()
194194
}
195195
catch (Exception ex)
196196
{
197-
_logger.Value.WriteCore(
197+
_logger.Value.Write(
198198
TraceType.Error,
199199
0,
200200
new DataStoreErrorLogState(_context.GetType()),
@@ -262,7 +262,7 @@ public async Task<bool> MoveNext(CancellationToken cancellationToken)
262262
}
263263
catch (Exception ex)
264264
{
265-
_logger.Value.WriteCore(
265+
_logger.Value.Write(
266266
TraceType.Error,
267267
0,
268268
new DataStoreErrorLogState(_context.GetType()),

src/EntityFramework/Services/NullLoggerFactory.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@ private NullLogger()
2626
{
2727
}
2828

29-
public bool WriteCore(
29+
public void Write(
3030
TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
31+
{
32+
return;
33+
}
34+
35+
public bool IsEnabled(TraceType eventType)
3136
{
3237
return false;
3338
}

src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,17 @@ public virtual void StartLoggingForCurrentCallContext()
4848
#endif
4949
}
5050

51-
public virtual bool WriteCore(TraceType eventType, int eventId, [CanBeNull] object state, [CanBeNull] Exception exception, [CanBeNull] Func<object, Exception, string> formatter)
51+
public virtual void Write(TraceType eventType, int eventId, [CanBeNull] object state, [CanBeNull] Exception exception, [CanBeNull] Func<object, Exception, string> formatter)
5252
{
5353
var errorState = state as DataStoreErrorLogState;
5454
if (errorState != null && exception != null && LastError != null)
5555
{
5656
LastError.SetError(errorState.ContextType, exception);
5757
}
58+
}
5859

60+
public virtual bool IsEnabled(TraceType eventType)
61+
{
5962
return true;
6063
}
6164

test/EntityFramework.FunctionalTests/DataStoreErrorLogStateTest.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public IDisposable BeginScope(object state)
171171
return NullScope.Instance;
172172
}
173173

174-
public bool WriteCore(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
174+
public void Write(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
175175
{
176176
var error = state as DataStoreErrorLogState;
177177
if (error != null)
@@ -180,7 +180,10 @@ public bool WriteCore(TraceType eventType, int eventId, object state, Exception
180180
LastDataStoreErrorException = exception;
181181
LastDataStoreErrorFormatter = formatter;
182182
}
183+
}
183184

185+
public bool IsEnabled(TraceType eventType)
186+
{
184187
return true;
185188
}
186189

test/EntityFramework.FunctionalTests/TestFileLogger.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var logDirectory
4141
_logFilePath = Path.Combine(logDirectory, fileName);
4242
}
4343

44-
public bool WriteCore(
44+
public void Write(
4545
TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
4646
{
4747
if (formatter != null)
@@ -56,7 +56,10 @@ public bool WriteCore(
5656
}
5757
}
5858
}
59+
}
5960

61+
public bool IsEnabled(TraceType eventType)
62+
{
6063
return true;
6164
}
6265

test/EntityFramework.InMemory.Tests/InMemoryDataStoreTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public async Task Should_log_writes()
142142
await inMemoryDataStore.SaveChangesAsync(new[] { entityEntry });
143143

144144
mockLogger.Verify(
145-
l => l.WriteCore(
145+
l => l.Write(
146146
TraceType.Information,
147147
0,
148148
It.IsAny<string>(),

test/EntityFramework.Migrations.Tests/Infrastructure/MigratorTest.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,15 +1459,18 @@ public TestLogger(string name, StringBuilder builder)
14591459
_builder = builder;
14601460
}
14611461

1462-
public bool WriteCore(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
1462+
public void Write(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
14631463
{
14641464
_builder
14651465
.Append(_name)
14661466
.Append(" ")
14671467
.Append(eventType.ToString("G"))
14681468
.Append(" ")
14691469
.AppendLine(formatter(state, exception));
1470+
}
14701471

1472+
public bool IsEnabled(TraceType eventType)
1473+
{
14711474
return true;
14721475
}
14731476

test/EntityFramework.Relational.FunctionalTests/TestSqlLoggerFactory.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class SqlLogger : ILogger
6060

6161
private CancellationTokenSource _cancellationTokenSource;
6262

63-
public bool WriteCore(
63+
public void Write(
6464
TraceType eventType,
6565
int eventId,
6666
object state,
@@ -79,7 +79,10 @@ public bool WriteCore(
7979

8080
SqlStatements.Add(sql);
8181
}
82+
}
8283

84+
public bool IsEnabled(TraceType eventType)
85+
{
8386
return true;
8487
}
8588

test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,13 @@ public IEnumerable<string> Messages
3030
get { return _messages; }
3131
}
3232

33-
public bool WriteCore(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
33+
public void Write(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
3434
{
3535
_messages.Add(formatter(state, exception));
36+
}
37+
38+
public bool IsEnabled(TraceType eventType)
39+
{
3640
return true;
3741
}
3842

0 commit comments

Comments
 (0)