From 7672df275a2ec5c9ad774ef3920a33bd6bfff3db Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Thu, 8 Sep 2022 20:28:26 +0200 Subject: [PATCH] add redis test --- .../MareSynchronosServer.csproj | 1 + .../MareSynchronosServer/Program.cs | 28 +++++++++++-------- .../MareSynchronosServer/Startup.cs | 7 ++++- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj index 8ac0f94..621a2e2 100644 --- a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj +++ b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj @@ -28,6 +28,7 @@ + diff --git a/MareSynchronosServer/MareSynchronosServer/Program.cs b/MareSynchronosServer/MareSynchronosServer/Program.cs index 2208144..61dfd08 100644 --- a/MareSynchronosServer/MareSynchronosServer/Program.cs +++ b/MareSynchronosServer/MareSynchronosServer/Program.cs @@ -17,25 +17,29 @@ namespace MareSynchronosServer { var hostBuilder = CreateHostBuilder(args); var host = hostBuilder.Build(); - using (var scope = host.Services.CreateScope()) { var services = scope.ServiceProvider; using var context = services.GetRequiredService(); - context.Database.Migrate(); - context.SaveChanges(); - // clean up residuals - var users = context.Users; - foreach (var user in users) + var noDbActions = Environment.GetEnvironmentVariable("NODBACTIONS"); + if (string.IsNullOrEmpty(noDbActions) || noDbActions == "0") { - user.CharacterIdentification = null; + context.Database.Migrate(); + context.SaveChanges(); + + // clean up residuals + var users = context.Users; + foreach (var user in users) + { + user.CharacterIdentification = null; + } + var looseFiles = context.Files.Where(f => f.Uploaded == false); + var unfinishedRegistrations = context.LodeStoneAuth.Where(c => c.StartedAt != null); + context.RemoveRange(unfinishedRegistrations); + context.RemoveRange(looseFiles); + context.SaveChanges(); } - var looseFiles = context.Files.Where(f => f.Uploaded == false); - var unfinishedRegistrations = context.LodeStoneAuth.Where(c => c.StartedAt != null); - context.RemoveRange(unfinishedRegistrations); - context.RemoveRange(looseFiles); - context.SaveChanges(); var metrics = services.GetRequiredService(); diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs index 4ec1df9..e978091 100644 --- a/MareSynchronosServer/MareSynchronosServer/Startup.cs +++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs @@ -112,7 +112,7 @@ namespace MareSynchronosServer services.AddSingleton(); - services.AddSignalR(hubOptions => + var signalRserviceBuilder = services.AddSignalR(hubOptions => { hubOptions.MaximumReceiveMessageSize = long.MaxValue; hubOptions.EnableDetailedErrors = true; @@ -120,6 +120,11 @@ namespace MareSynchronosServer hubOptions.StreamBufferCapacity = 200; hubOptions.AddFilter(); }); + var redis = mareConfig.GetValue("RedisConnectionString", string.Empty); + if (!string.IsNullOrEmpty(redis)) + { + signalRserviceBuilder.AddStackExchangeRedis(redis); + } } public void Configure(IApplicationBuilder app, IWebHostEnvironment env)