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

Small fixes to SignalR service extension methods (#7375)

This commit is contained in:
James Newton-King 2019-02-08 19:15:53 +13:00 committed by GitHub
parent b7d3b3aa13
commit 0dc06b37cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/SignalR/server/SignalR/src/SignalRDependencyInjectionExtensions.cs
View File

@ -24,6 +24,11 @@ namespace Microsoft.Extensions.DependencyInjection
/// <returns>The same instance of the <see cref="ISignalRServerBuilder"/> for chaining.</returns> /// <returns>The same instance of the <see cref="ISignalRServerBuilder"/> for chaining.</returns>
public static ISignalRServerBuilder AddHubOptions<THub>(this ISignalRServerBuilder signalrBuilder, Action<HubOptions<THub>> configure) where THub : Hub public static ISignalRServerBuilder AddHubOptions<THub>(this ISignalRServerBuilder signalrBuilder, Action<HubOptions<THub>> configure) where THub : Hub
{ {
if (signalrBuilder == null)
{
throw new ArgumentNullException(nameof(signalrBuilder));
}
signalrBuilder.Services.AddSingleton<IConfigureOptions<HubOptions<THub>>, HubOptionsSetup<THub>>(); signalrBuilder.Services.AddSingleton<IConfigureOptions<HubOptions<THub>>, HubOptionsSetup<THub>>();
signalrBuilder.Services.Configure(configure); signalrBuilder.Services.Configure(configure);
return signalrBuilder; return signalrBuilder;
@ -36,6 +41,11 @@ namespace Microsoft.Extensions.DependencyInjection
/// <returns>An <see cref="ISignalRServerBuilder"/> that can be used to further configure the SignalR services.</returns> /// <returns>An <see cref="ISignalRServerBuilder"/> that can be used to further configure the SignalR services.</returns>
public static ISignalRServerBuilder AddSignalR(this IServiceCollection services) public static ISignalRServerBuilder AddSignalR(this IServiceCollection services)
{ {
if (services == null)
{
throw new ArgumentNullException(nameof(services));
}
services.AddConnections(); services.AddConnections();
// Disable the WebSocket keep alive since SignalR has it's own // Disable the WebSocket keep alive since SignalR has it's own
services.Configure<WebSocketOptions>(o => o.KeepAliveInterval = TimeSpan.Zero); services.Configure<WebSocketOptions>(o => o.KeepAliveInterval = TimeSpan.Zero);
@ -48,10 +58,15 @@ namespace Microsoft.Extensions.DependencyInjection
/// Adds SignalR services to the specified <see cref="IServiceCollection" />. /// Adds SignalR services to the specified <see cref="IServiceCollection" />.
/// </summary> /// </summary>
/// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param> /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
/// <param name="configure">An <see cref="Action{MvcOptions}"/> to configure the provided <see cref="HubOptions"/>.</param> /// <param name="configure">An <see cref="Action{HubOptions}"/> to configure the provided <see cref="HubOptions"/>.</param>
/// <returns>An <see cref="ISignalRServerBuilder"/> that can be used to further configure the SignalR services.</returns> /// <returns>An <see cref="ISignalRServerBuilder"/> that can be used to further configure the SignalR services.</returns>
public static ISignalRServerBuilder AddSignalR(this IServiceCollection services, Action<HubOptions> configure) public static ISignalRServerBuilder AddSignalR(this IServiceCollection services, Action<HubOptions> configure)
{ {
if (services == null)
{
throw new ArgumentNullException(nameof(services));
}
return services.Configure(configure) return services.Configure(configure)
.AddSignalR(); .AddSignalR();
} }