Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Commit b55827e

Browse files
author
moozzyk
committed
Addendum to #405
We enabled passing null TraceListener but extension methods were not updated accordingly and would still not allow to pass a null TraceListner.
1 parent 5019dd2 commit b55827e

File tree

3 files changed

+16
-26
lines changed

3 files changed

+16
-26
lines changed

src/Microsoft.Extensions.Logging.TraceSource/TraceSourceFactoryExtensions.cs

-10
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ public static ILoggerFactory AddTraceSource(
2424
throw new ArgumentNullException(nameof(switchName));
2525
}
2626

27-
if (listener == null)
28-
{
29-
throw new ArgumentNullException(nameof(listener));
30-
}
31-
3227
return factory.AddTraceSource(new SourceSwitch(switchName), listener);
3328
}
3429

@@ -47,11 +42,6 @@ public static ILoggerFactory AddTraceSource(
4742
throw new ArgumentNullException(nameof(sourceSwitch));
4843
}
4944

50-
if (listener == null)
51-
{
52-
throw new ArgumentNullException(nameof(listener));
53-
}
54-
5545
factory.AddProvider(new TraceSourceLoggerProvider(sourceSwitch, listener));
5646

5747
return factory;

test/Microsoft.Extensions.Logging.Test/TraceSourceLoggerTest.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static void IsEnabledReturnsCorrectValue()
2020
var logger = factory.CreateLogger("Test");
2121

2222
// Act
23-
factory.AddTraceSource(testSwitch, new ConsoleTraceListener());
23+
factory.AddTraceSource(testSwitch, null);
2424

2525
// Assert
2626
Assert.True(logger.IsEnabled(LogLevel.Critical));
@@ -49,8 +49,8 @@ public static void MultipleLoggers_IsEnabledReturnsCorrectValue(SourceLevels fir
4949
var logger = factory.CreateLogger("Test");
5050

5151
// Act
52-
factory.AddTraceSource(firstSwitch, new ConsoleTraceListener());
53-
factory.AddTraceSource(secondSwitch, new ConsoleTraceListener());
52+
factory.AddTraceSource(firstSwitch, null);
53+
factory.AddTraceSource(secondSwitch, null);
5454

5555
// Assert
5656
Assert.Equal(expected, logger.IsEnabled(LogLevel.Information));

test/Microsoft.Extensions.Logging.Test/project.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,19 @@
1616
},
1717
"testRunner": "xunit",
1818
"frameworks": {
19+
"net451": {
20+
"dependencies": {
21+
"Microsoft.Extensions.Logging.EventLog": "1.0.0-*",
22+
"Moq": "4.2.1312.1622",
23+
"xunit.runner.console": "2.1.0"
24+
},
25+
"frameworkAssemblies": {
26+
"System.Runtime": {
27+
"type": "build"
28+
},
29+
"System.Threading.Tasks": ""
30+
}
31+
},
1932
"netcoreapp1.0": {
2033
"imports": [
2134
"dnxcore50",
@@ -29,19 +42,6 @@
2942
"System.Diagnostics.Process": "4.1.0-*",
3043
"moq.netcore": "4.4.0-beta8"
3144
}
32-
},
33-
"net451": {
34-
"dependencies": {
35-
"Microsoft.Extensions.Logging.EventLog": "1.0.0-*",
36-
"Moq": "4.2.1312.1622",
37-
"xunit.runner.console": "2.1.0"
38-
},
39-
"frameworkAssemblies": {
40-
"System.Runtime": {
41-
"type": "build"
42-
},
43-
"System.Threading.Tasks": ""
44-
}
4545
}
4646
}
4747
}

0 commit comments

Comments
 (0)