t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more redis fixes

Browse Source
This commit is contained in:
Stanley Dimant
2022-09-13 12:18:02 +02:00
parent 3cdaa53a65
commit 56728d1fba
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronosServer/MareSynchronosServer/Startup.cs
View File

@@ -137,7 +137,7 @@ namespace MareSynchronosServer
services.AddStackExchangeRedisCache(opt => services.AddStackExchangeRedisCache(opt =>
{ {
opt.Configuration = redis; opt.Configuration = redis;
opt.InstanceName = "MareSynchronos"; opt.InstanceName = "MareSynchronosCache:";
}); });
services.AddSingleton<IClientIdentificationService, DistributedClientIdentificationService>(); services.AddSingleton<IClientIdentificationService, DistributedClientIdentificationService>();
services.AddHostedService(p => p.GetService<IClientIdentificationService>()); services.AddHostedService(p => p.GetService<IClientIdentificationService>());

4
MareSynchronosServer/MareSynchronosServices/Discord/DiscordBot.cs
View File

@@ -690,7 +690,9 @@ public class DiscordBot : IHostedService
updateStatusCts = new(); updateStatusCts = new();
while (!updateStatusCts.IsCancellationRequested) while (!updateStatusCts.IsCancellationRequested)
{ {
await discordClient.SetActivityAsync(new Game("Mare for " + clientService.GetOnlineUsers() + " Users")).ConfigureAwait(false); var onlineUsers = clientService.GetOnlineUsers();
logger.LogInformation("Users online: " + onlineUsers);
await discordClient.SetActivityAsync(new Game("Mare for " + onlineUsers + " Users")).ConfigureAwait(false);
await Task.Delay(TimeSpan.FromSeconds(15)).ConfigureAwait(false); await Task.Delay(TimeSpan.FromSeconds(15)).ConfigureAwait(false);
} }
} }

2
MareSynchronosServer/MareSynchronosServices/Startup.cs
View File

@@ -58,7 +58,7 @@ public class Startup
services.AddStackExchangeRedisCache(opt => services.AddStackExchangeRedisCache(opt =>
{ {
opt.Configuration = redis; opt.Configuration = redis;
opt.InstanceName = "MareSynchronos"; opt.InstanceName = "MareSynchronosCache:";
}); });
services.AddSingleton<IClientIdentificationService, DistributedClientIdentificationService>(); services.AddSingleton<IClientIdentificationService, DistributedClientIdentificationService>();
services.AddHostedService(p => p.GetService<IClientIdentificationService>()); services.AddHostedService(p => p.GetService<IClientIdentificationService>());

15
MareSynchronosServer/MareSynchronosShared/Services/DistributedClientIdentificationService.cs
View File

@@ -2,6 +2,7 @@
using MareSynchronosShared.Metrics; using MareSynchronosShared.Metrics;
using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using StackExchange.Redis; using StackExchange.Redis;
namespace MareSynchronosShared.Services; namespace MareSynchronosShared.Services;
@@ -9,21 +10,31 @@ namespace MareSynchronosShared.Services;
public class DistributedClientIdentificationService : BaseClientIdentificationService public class DistributedClientIdentificationService : BaseClientIdentificationService
{ {
private readonly IDistributedCache distributedCache; private readonly IDistributedCache distributedCache;
private readonly ILogger<DistributedClientIdentificationService> logger;
private readonly IConfiguration configuration; private readonly IConfiguration configuration;
private const string RedisPrefix = "uidcache:"; private const string RedisPrefix = "uidcache:";
public DistributedClientIdentificationService(MareMetrics metrics, IDistributedCache distributedCache, IConfiguration configuration) : base(metrics) public DistributedClientIdentificationService(MareMetrics metrics, IDistributedCache distributedCache, IConfiguration configuration, ILogger<DistributedClientIdentificationService> logger) : base(metrics)
{ {
this.distributedCache = distributedCache; this.distributedCache = distributedCache;
this.logger = logger;
this.configuration = configuration.GetSection("MareSynchronos"); this.configuration = configuration.GetSection("MareSynchronos");
} }
public override int GetOnlineUsers() public override int GetOnlineUsers()
{
try
{ {
var redis = configuration.GetValue<string>("RedisConnectionString"); var redis = configuration.GetValue<string>("RedisConnectionString");
var conn = ConnectionMultiplexer.Connect(redis); var conn = ConnectionMultiplexer.Connect(redis);
var endpoint = conn.GetEndPoints().First(); var endpoint = conn.GetEndPoints().First();
return conn.GetServer(endpoint).Keys(pattern: RedisPrefix + "*").Count(); return conn.GetServer(endpoint).Keys(pattern: "*" + RedisPrefix + "*").Count();
}
catch (Exception ex)
{
logger.LogError(ex, "Error during GetOnlineUsers");
return 0;
}
} }
public override string? GetCharacterIdentForUid(string uid) public override string? GetCharacterIdentForUid(string uid)