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

Custom hub options don't change global hub options (#9638)

This commit is contained in:
BrennanConroy 2019-04-22 11:35:18 -07:00 committed by GitHub
parent 9b4137ce17
commit 10dc6e3bdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SignalR/server/Core/src/Internal/HubOptionsSetup.cs
View File

@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal
internal static TimeSpan DefaultClientTimeoutInterval => TimeSpan.FromSeconds(30);
internal const int DefaultMaximumMessageSize = 32 * 1024 * 1024;
internal const int DefaultMaximumMessageSize = 32 * 1024;
private readonly List<string> _defaultProtocols = new List<string>();

9
src/SignalR/server/Core/src/Internal/HubOptionsSetup`T.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.SignalR.Internal
@ -15,7 +16,11 @@ namespace Microsoft.AspNetCore.SignalR.Internal
public void Configure(HubOptions<THub> options)
{
options.SupportedProtocols = _hubOptions.SupportedProtocols;
options.SupportedProtocols = new List<string>(_hubOptions.SupportedProtocols.Count);
foreach (var protocol in _hubOptions.SupportedProtocols)
{
options.SupportedProtocols.Add(protocol);
}
options.KeepAliveInterval = _hubOptions.KeepAliveInterval;
options.HandshakeTimeout = _hubOptions.HandshakeTimeout;
}

17
src/SignalR/server/SignalR/test/AddSignalRTests.cs
View File

@ -1,4 +1,4 @@
// Copyright(c) .NET Foundation.All rights reserved.
// Copyright(c) .NET Foundation.All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
@ -65,6 +65,21 @@ namespace Microsoft.AspNetCore.SignalR.Tests
Assert.IsType<CustomHubContext<CustomTHub, string>>(serviceProvider.GetRequiredService<IHubContext<CustomTHub, string>>());
Assert.IsType<CustomHubContext<CustomDynamicHub>>(serviceProvider.GetRequiredService<IHubContext<CustomDynamicHub>>());
}
[Fact]
public void HubSpecificOptionsDoNotAffectGlobalHubOptions()
{
var serviceCollection = new ServiceCollection();
serviceCollection.AddSignalR().AddHubOptions<CustomHub>(options =>
{
options.SupportedProtocols.Clear();
});
var serviceProvider = serviceCollection.BuildServiceProvider();
Assert.Equal(1, serviceProvider.GetRequiredService<IOptions<HubOptions>>().Value.SupportedProtocols.Count);
Assert.Equal(0, serviceProvider.GetRequiredService<IOptions<HubOptions<CustomHub>>>().Value.SupportedProtocols.Count);
}
}
public class CustomHub : Hub