huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to options

This commit is contained in:
Hao Kung 2015-09-02 14:26:42 -07:00
parent ecc5874b6c
commit 088f2f81cc
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs
View File

@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Diagnostics.Elm
public ElmCaptureMiddleware(RequestDelegate next, ILoggerFactory factory, IOptions<ElmOptions> options) public ElmCaptureMiddleware(RequestDelegate next, ILoggerFactory factory, IOptions<ElmOptions> options)
{ {
_next = next; _next = next;
_options = options.Options; _options = options.Value;
_logger = factory.CreateLogger<ElmCaptureMiddleware>(); _logger = factory.CreateLogger<ElmCaptureMiddleware>();
} }

2
src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Builder
var factory = builder.ApplicationServices.GetRequiredService<ILoggerFactory>(); var factory = builder.ApplicationServices.GetRequiredService<ILoggerFactory>();
var store = builder.ApplicationServices.GetRequiredService<ElmStore>(); var store = builder.ApplicationServices.GetRequiredService<ElmStore>();
var options = builder.ApplicationServices.GetService<IOptions<ElmOptions>>(); var options = builder.ApplicationServices.GetService<IOptions<ElmOptions>>();
factory.AddProvider(new ElmLoggerProvider(store, options?.Options ?? new ElmOptions())); factory.AddProvider(new ElmLoggerProvider(store, options?.Value ?? new ElmOptions()));
return builder.UseMiddleware<ElmCaptureMiddleware>(); return builder.UseMiddleware<ElmCaptureMiddleware>();
} }

2
src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs
View File

@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Diagnostics.Elm
public ElmPageMiddleware(RequestDelegate next, IOptions<ElmOptions> options, ElmStore store) public ElmPageMiddleware(RequestDelegate next, IOptions<ElmOptions> options, ElmStore store)
{ {
_next = next; _next = next;
_options = options.Options; _options = options.Value;
_store = store; _store = store;
} }

19
test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
View File

@ -44,9 +44,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
var factory = new LoggerFactory(); var factory = new LoggerFactory();
var optionsMock = new Mock<IOptions<ElmOptions>>(); var optionsMock = new Mock<IOptions<ElmOptions>>();
optionsMock optionsMock
.SetupGet(o => o.Options) .SetupGet(o => o.Value)
.Returns(new ElmOptions()); .Returns(new ElmOptions());
factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Options)); factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Value));
RequestDelegate next = _ => RequestDelegate next = _ =>
{ {
@ -81,9 +81,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
var factory = new LoggerFactory(); var factory = new LoggerFactory();
var optionsMock = new Mock<IOptions<ElmOptions>>(); var optionsMock = new Mock<IOptions<ElmOptions>>();
optionsMock optionsMock
.SetupGet(o => o.Options) .SetupGet(o => o.Value)
.Returns(new ElmOptions()); .Returns(new ElmOptions());
factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Options)); factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Value));
RequestDelegate next = _ => RequestDelegate next = _ =>
{ {
@ -129,9 +129,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
var factory = new LoggerFactory(); var factory = new LoggerFactory();
var optionsMock = new Mock<IOptions<ElmOptions>>(); var optionsMock = new Mock<IOptions<ElmOptions>>();
optionsMock optionsMock
.SetupGet(o => o.Options) .SetupGet(o => o.Value)
.Returns(new ElmOptions()); .Returns(new ElmOptions());
factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Options)); factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Value));
RequestDelegate next = _ => RequestDelegate next = _ =>
{ {
@ -311,18 +311,13 @@ namespace Microsoft.AspNet.Diagnostics.Tests
_innerOptions = innerOptions; _innerOptions = innerOptions;
} }
public ElmOptions Options public ElmOptions Value
{ {
get get
{ {
return _innerOptions; return _innerOptions;
} }
} }
public ElmOptions GetNamedOptions(string name)
{
return _innerOptions;
}
} }
} }
} }