Skip to content

Commit 0329aae

Browse files
KSemenenkoKSemenenko
committed
logs + naming
1 parent 88e5412 commit 0329aae

File tree

5 files changed

+41
-19
lines changed

5 files changed

+41
-19
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<RepositoryUrl>https://github.com/managedcode/Orleans.SignalR</RepositoryUrl>
1818
<PackageProjectUrl>https://github.com/managedcode/Orleans.SignalR</PackageProjectUrl>
1919
<Product>Managed Code - Orleans SignalR</Product>
20-
<Version>7.1.3</Version>
21-
<PackageVersion>7.1.3</PackageVersion>
20+
<Version>7.1.4</Version>
21+
<PackageVersion>7.1.4</PackageVersion>
2222

2323
</PropertyGroup>
2424
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

‎ManagedCode.Orleans.SignalR.Core/Helpers/Logs.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,58 +15,58 @@ public static partial class Logs
1515
public static partial void Ping(ILogger logger, string grainType, string grainId);
1616

1717
[LoggerMessage(
18-
Level = LogLevel.Trace,
18+
Level = LogLevel.Information,
1919
Message = "{grainType}:{grainId} AddConnection `{connectionId}`")]
2020
public static partial void AddConnection(ILogger logger, string grainType, string grainId, string connectionId);
2121

2222
[LoggerMessage(
23-
Level = LogLevel.Trace,
23+
Level = LogLevel.Information,
2424
Message = "{grainType}:{grainId} RemoveConnection `{connectionId}`")]
2525
public static partial void RemoveConnection(ILogger logger, string grainType, string grainId, string connectionId);
2626

2727
[LoggerMessage(
28-
Level = LogLevel.Trace,
28+
Level = LogLevel.Information,
2929
Message = "{grainType}:{grainId} SendToAll")]
3030
public static partial void SendToAll(ILogger logger, string grainType, string grainId);
3131

3232
[LoggerMessage(
33-
Level = LogLevel.Trace,
33+
Level = LogLevel.Information,
3434
Message = "{grainType}:{grainId} SendToAllExcept")]
3535
public static partial void SendToAllExcept(ILogger logger, string grainType, string grainId, string[] expectedConnectionIds);
3636

3737
[LoggerMessage(
38-
Level = LogLevel.Trace,
38+
Level = LogLevel.Information,
3939
Message = "{grainType}:{grainId} SendToConnection")]
4040
public static partial void SendToConnection(ILogger logger, string grainType, string grainId, string connectionId);
4141

4242
[LoggerMessage(
43-
Level = LogLevel.Trace,
43+
Level = LogLevel.Information,
4444
Message = "{grainType}:{grainId} SendToConnections")]
4545
public static partial void SendToConnections(ILogger logger, string grainType, string grainId, string[] expectedConnectionIds);
4646

4747

4848
[LoggerMessage(
49-
Level = LogLevel.Trace,
49+
Level = LogLevel.Information,
5050
Message = "{grainType}:{grainId} SendToGroup")]
5151
public static partial void SendToGroup(ILogger logger, string grainType, string grainId);
5252

5353
[LoggerMessage(
54-
Level = LogLevel.Trace,
54+
Level = LogLevel.Information,
5555
Message = "{grainType}:{grainId} SendToGroupExcept")]
5656
public static partial void SendToGroupExcept(ILogger logger, string grainType, string grainId, string[] expectedConnectionIds);
5757

5858
[LoggerMessage(
59-
Level = LogLevel.Trace,
59+
Level = LogLevel.Information,
6060
Message = "{grainType}:{grainId} TryCompleteResult")]
6161
public static partial void TryCompleteResult(ILogger logger, string grainType, string grainId, string connectionId);
6262

6363
[LoggerMessage(
64-
Level = LogLevel.Trace,
64+
Level = LogLevel.Information,
6565
Message = "{grainType}:{grainId} TryGetReturnType")]
6666
public static partial void TryGetReturnType(ILogger logger, string grainType, string grainId);
6767

6868
[LoggerMessage(
69-
Level = LogLevel.Trace,
69+
Level = LogLevel.Information,
7070
Message = "{grainType}:{grainId} AddInvocation")]
7171
public static partial void AddInvocation(ILogger logger, string grainType, string grainId, string invocationId, string connectionId);
7272

@@ -76,7 +76,7 @@ public static partial class Logs
7676
public static partial void RemoveInvocation(ILogger logger, string grainType, string grainId);
7777

7878
[LoggerMessage(
79-
Level = LogLevel.Trace,
79+
Level = LogLevel.Information,
8080
Message = "{grainType}:{grainId} SendToUser")]
8181
public static partial void SendToUser(ILogger logger, string grainType, string grainId);
8282

‎ManagedCode.Orleans.SignalR.Core/SignalR/NameHelperGenerator.cs‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ private static string ConnectionNamespace<TMessage>(string hub)
1212

1313
public static ISignalRConnectionHolderGrain GetConnectionHolderGrain<THub>(IGrainFactory grainFactory)
1414
{
15-
return grainFactory.GetGrain<ISignalRConnectionHolderGrain>(typeof(THub).FullName!);
15+
return grainFactory.GetGrain<ISignalRConnectionHolderGrain>(Base64Encode(typeof(THub).FullName!));
1616
}
1717

1818
public static ISignalRInvocationGrain GetInvocationGrain<THub>(IGrainFactory grainFactory, string invocationId)
1919
{
20-
return grainFactory.GetGrain<ISignalRInvocationGrain>(typeof(THub).FullName + "." + invocationId);
20+
return grainFactory.GetGrain<ISignalRInvocationGrain>(Base64Encode(typeof(THub).FullName + ":" + invocationId));
2121
}
2222

2323
// public static ISignalRGroupHolderGrain GetGroupHolderGrain<THub>(IGrainFactory grainFactory)
@@ -27,14 +27,26 @@ public static ISignalRInvocationGrain GetInvocationGrain<THub>(IGrainFactory gra
2727

2828
public static ISignalRUserGrain GetSignalRUserGrain<THub>(IGrainFactory grainFactory, string userId)
2929
{
30-
return grainFactory.GetGrain<ISignalRUserGrain>(typeof(THub).FullName + "." + userId);
30+
return grainFactory.GetGrain<ISignalRUserGrain>(Base64Encode(typeof(THub).FullName + ":" + userId));
3131
}
3232

3333
public static ISignalRGroupGrain GetSignalRGroupGrain<THub>(IGrainFactory grainFactory, string groupId)
3434
{
35-
return grainFactory.GetGrain<ISignalRGroupGrain>(typeof(THub).FullName + "." + groupId);
35+
return grainFactory.GetGrain<ISignalRGroupGrain>(Base64Encode(typeof(THub).FullName + ":" + groupId));
3636
}
3737

38+
public static string Base64Encode(string plainText)
39+
{
40+
var plainTextBytes = System.Text.Encoding.UTF8.GetBytes(plainText);
41+
return System.Convert.ToBase64String(plainTextBytes);
42+
}
43+
44+
public static string Base64Decode(string base64EncodedData)
45+
{
46+
var base64EncodedBytes = System.Convert.FromBase64String(base64EncodedData);
47+
return System.Text.Encoding.UTF8.GetString(base64EncodedBytes);
48+
}
49+
3850
// public static IAsyncStream<TMessage> GetStream<THub, TMessage>(IClusterClient clusterClient,
3951
// string streamProviderName, string streamName)
4052
// {

‎ManagedCode.Orleans.SignalR.Tests/Cluster/Grains/TestGrain.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public Task PushMessage(string message)
2929

3030
public async Task<string> GetMessageInvoke(string connectionId)
3131
{
32+
await Task.Yield();
3233
var localConnection = connectionId;
3334
var message = await Task.Run(() => _hubContext.Clients.Client(localConnection)
3435
.InvokeAsync<string>("GetMessage", CancellationToken.None));
@@ -38,6 +39,7 @@ public async Task<string> GetMessageInvoke(string connectionId)
3839

3940
public async Task<string> GetMessage(string connectionId)
4041
{
42+
await Task.Yield();
4143
var message = await Task.Run(() => _orleansHubContext.Clients.Client(connectionId).GetMessage());
4244

4345
return message;

‎ManagedCode.Orleans.SignalR.Tests/HubTests.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Concurrent;
22
using System.Threading.Channels;
33
using FluentAssertions;
4+
using ManagedCode.Orleans.SignalR.Core.SignalR;
45
using ManagedCode.Orleans.SignalR.Tests.Cluster;
56
using ManagedCode.Orleans.SignalR.Tests.Cluster.Grains.Interfaces;
67
using ManagedCode.Orleans.SignalR.Tests.TestApp;
@@ -27,6 +28,13 @@ public HubTests(SiloCluster testApp, ITestOutputHelper outputHelper)
2728
_secondApp = new TestWebApplication(_siloCluster, 8082);
2829
}
2930

31+
[Fact]
32+
public void Base64Test()
33+
{
34+
var name = NameHelperGenerator.Base64Encode(typeof(SimpleTestHub).FullName);
35+
name.Should().Be("TWFuYWdlZENvZGUuT3JsZWFucy5TaWduYWxSLlRlc3RzLlRlc3RBcHAuSHVicy5TaW1wbGVUZXN0SHVi");
36+
}
37+
3038
[Fact]
3139
public async Task ClientInvokeAndGetResult()
3240
{
@@ -92,7 +100,7 @@ public async Task InvokeAsyncAndOnTest()
92100
public async Task AuthInvokeAsyncAndOnTest()
93101
{
94102
var client = _firstApp.CreateHttpClient();
95-
var responseMessage = await client.GetAsync("/auth?user=TestUser");
103+
var responseMessage = await client.GetAsync("/auth?user=TestUser@gmail.com");
96104
var token = await responseMessage.Content.ReadAsStringAsync();
97105
var hubConnection1 = _firstApp.CreateSignalRClient(nameof(SimpleTestHub),
98106
configureConnection: options => { options.AccessTokenProvider = () => Task.FromResult(token); });

0 commit comments

Comments
 (0)