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

add net451 support to signalr.redis

This commit is contained in:
Russell Seamer 2016-11-29 14:24:17 +00:00 committed by moozzyk
parent 2039a18971
commit 4158dfed8f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Microsoft.AspNetCore.SignalR.Redis/RedisHubLifetimeManager.cs
View File

@ -11,6 +11,7 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using StackExchange.Redis; using StackExchange.Redis;
@ -40,7 +41,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis
_redisServerConnection = _options.Connect(writer); _redisServerConnection = _options.Connect(writer);
_bus = _redisServerConnection.GetSubscriber(); _bus = _redisServerConnection.GetSubscriber();
var previousBroadcastTask = Task.CompletedTask; var previousBroadcastTask = TaskCache.CompletedTask;
_bus.Subscribe(typeof(THub).FullName, async (c, data) => _bus.Subscribe(typeof(THub).FullName, async (c, data) =>
{ {
@ -118,15 +119,15 @@ namespace Microsoft.AspNetCore.SignalR.Redis
public override Task OnConnectedAsync(Connection connection) public override Task OnConnectedAsync(Connection connection)
{ {
var redisSubscriptions = connection.Metadata.GetOrAdd("redis_subscriptions", _ => new HashSet<string>()); var redisSubscriptions = connection.Metadata.GetOrAdd("redis_subscriptions", _ => new HashSet<string>());
var connectionTask = Task.CompletedTask; var connectionTask = TaskCache.CompletedTask;
var userTask = Task.CompletedTask; var userTask = TaskCache.CompletedTask;
_connections.Add(connection); _connections.Add(connection);
var connectionChannel = typeof(THub).FullName + "." + connection.ConnectionId; var connectionChannel = typeof(THub).FullName + "." + connection.ConnectionId;
redisSubscriptions.Add(connectionChannel); redisSubscriptions.Add(connectionChannel);
var previousConnectionTask = Task.CompletedTask; var previousConnectionTask = TaskCache.CompletedTask;
connectionTask = _bus.SubscribeAsync(connectionChannel, async (c, data) => connectionTask = _bus.SubscribeAsync(connectionChannel, async (c, data) =>
{ {
@ -141,7 +142,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis
var userChannel = typeof(THub).FullName + ".user." + connection.User.Identity.Name; var userChannel = typeof(THub).FullName + ".user." + connection.User.Identity.Name;
redisSubscriptions.Add(userChannel); redisSubscriptions.Add(userChannel);
var previousUserTask = Task.CompletedTask; var previousUserTask = TaskCache.CompletedTask;
// TODO: Look at optimizing (looping over connections checking for Name) // TODO: Look at optimizing (looping over connections checking for Name)
userTask = _bus.SubscribeAsync(userChannel, async (c, data) => userTask = _bus.SubscribeAsync(userChannel, async (c, data) =>
@ -209,7 +210,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis
return; return;
} }
var previousTask = Task.CompletedTask; var previousTask = TaskCache.CompletedTask;
await _bus.SubscribeAsync(groupChannel, async (c, data) => await _bus.SubscribeAsync(groupChannel, async (c, data) =>
{ {

7
src/Microsoft.AspNetCore.SignalR.Redis/project.json
View File

@ -25,11 +25,16 @@
"Microsoft.AspNetCore.SignalR": { "Microsoft.AspNetCore.SignalR": {
"target": "project" "target": "project"
}, },
"Microsoft.Extensions.TaskCache.Sources": {
"version": "1.2.0-*",
"type": "build"
},
"NETStandard.Library": "1.6.1-*", "NETStandard.Library": "1.6.1-*",
"StackExchange.Redis.StrongName": "1.1.605" "StackExchange.Redis.StrongName": "1.1.605"
}, },
"frameworks": { "frameworks": {
"netstandard1.6": {} "netstandard1.6": {},
"net451": {}
} }
} }