diff --git a/Program.cs b/Program.cs index efd0755..3edcca5 100644 --- a/Program.cs +++ b/Program.cs @@ -37,7 +37,7 @@ builder.Services.AddSession(options => options.IdleTimeout = TimeSpan.FromHours(8); options.Cookie.HttpOnly = true; options.Cookie.IsEssential = true; - options.Cookie.Name = ".VoidScavengers.Admin.2"; + options.Cookie.Name = ".Divers.Admin"; }); // ---- MySQL conn string from env ---- @@ -61,6 +61,13 @@ builder.Services.AddOptions() .ValidateOnStart(); // Redis + zone leases + WAL +//builder.Services.AddSingleton(); +var redisCs = RedisManager.BuildRedisConnectionStringFromEnv() + ?? throw new Exception("REDIS_CONNECTION_STRING required"); + +var redisMux = ConnectionMultiplexer.Connect(redisCs); + +builder.Services.AddSingleton(redisMux); builder.Services.AddSingleton(); builder.Services.AddScoped(); @@ -82,20 +89,11 @@ builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddHttpClient(); // For CDN file hash computation -Console.WriteLine("Burning it down"); // Health checks builder.Services.AddHealthChecks() .AddCheck("mysql", tags: new[] { "ready" }); -var redisCs = RedisManager.BuildRedisConnectionStringFromEnv() - ?? throw new Exception("REDIS_CONNECTION_STRING required"); - -var redisMux = ConnectionMultiplexer.Connect(redisCs); -builder.Services.AddSingleton(redisMux); - -builder.Services.AddSingleton(); - builder.Services.AddDataProtection() .SetApplicationName("Void") .PersistKeysToStackExchangeRedis(() => redisMux.GetDatabase(), "Void:DataProtectionKeys"); diff --git a/Redis/IRedisManager.cs b/Redis/IRedisManager.cs index 12cd686..99724d8 100644 --- a/Redis/IRedisManager.cs +++ b/Redis/IRedisManager.cs @@ -30,7 +30,8 @@ public interface IRedisManager : IAsyncDisposable public sealed class RedisManager : IRedisManager { private readonly ILogger _logger; - private readonly ConnectionMultiplexer _mux; + //private readonly ConnectionMultiplexer _mux; + private readonly IConnectionMultiplexer _mux; public IDatabase Db => _mux.GetDatabase(); public ISubscriber Bus => _mux.GetSubscriber(); @@ -41,20 +42,16 @@ public sealed class RedisManager : IRedisManager WriteIndented = false }; - public RedisManager(ILogger logger) + public RedisManager(ILogger logger, IConnectionMultiplexer mux) { _logger = logger; var connString = BuildRedisConnectionStringFromEnv(); - _mux = ConnectionMultiplexer.Connect(connString); + _mux = mux;//ConnectionMultiplexer.Connect(connString); _logger.LogInformation("Connected to Redis: {Endpoints}", string.Join(",", _mux.GetEndPoints().Select(ep => ep.ToString()))); } - public RedisManager(ILogger logger, IConnectionMultiplexer mux) - { - _logger = logger; - _mux = (ConnectionMultiplexer)mux; - } + public async ValueTask DisposeAsync()