Fix resolver config

OpenShock · May 8, 2024 · 42ece53 · 42ece53
1 parent 39f1c78
commit 42ece53
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/Cron/CronConf.cs b/Cron/CronConf.cs
@@ -1,15 +1,5 @@
-namespace OpenShock.Cron;
+using OpenShock.ServicesCommon.Config;
 
-public sealed class CronConf
-{
-    public required string Db { get; init; }
-    public required RedisConfig Redis { get; init; }
-
-    public class RedisConfig
-    {
-        public required string Host { get; init; }
-        public required string User { get; init; }
-        public required string Password { get; init; }
-        public required ushort Port { get; init; }
-    }
-}
+namespace OpenShock.Cron;
+
+public sealed class CronConf : BaseConfig;
diff --git a/Cron/Program.cs b/Cron/Program.cs
@@ -60,14 +60,14 @@
 #pragma warning restore CS0618
         services.AddDbContextPool<OpenShockContext>(builder =>
         {
-            builder.UseNpgsql(config.Db);
+            builder.UseNpgsql(config.Db.Conn);
             builder.EnableSensitiveDataLogging();
             builder.EnableDetailedErrors();
         });
 
         services.AddDbContextFactory<OpenShockContext>(builder =>
         {
-            builder.UseNpgsql(config.Db);
+            builder.UseNpgsql(config.Db.Conn);
             builder.EnableSensitiveDataLogging();
             builder.EnableDetailedErrors();
         });

diff --git a/LiveControlGateway/Startup.cs b/LiveControlGateway/Startup.cs
@@ -84,6 +84,8 @@ public Startup(IConfiguration configuration)
     /// <param name="services"></param>
     public void ConfigureServices(IServiceCollection services)
     {
+        services.AddSingleton(_lcgConfig);
+
         // ----------------- DATABASE -----------------
 
         // How do I do this now with EFCore?!