logger

Server/Program.cs

@@ -3,9 +3,11 @@ using System.Security.Cryptography;
 using Core.Annotations;
 using Core.Context;
 using Core.Models.Enums;
+using Core.Models.External;
 using Core.Models.Spt.Config;
 using Core.Servers;
 using Core.Utils;
+using Serilog;
 
 namespace Server;
 
@@ -17,21 +19,33 @@ public static class Program
         HarmonyBootstrapper.LoadAllPatches(assemblies);
         var builder = WebApplication.CreateBuilder(args);
 
+        builder.Configuration.AddJsonFile("appsettings.json", true, true);
+        
+        CreateAndRegisterLogger(builder);
+
         RegisterSptComponents(builder.Services);
         RegisterModOverrideComponents(builder.Services, assemblies);
-        
         try
         {
             var serviceProvider = builder.Services.BuildServiceProvider();
             var watermark = serviceProvider.GetService<Watermark>();
+            // Initialize Watermak
             watermark.Initialize();
-            // TODO: var preSptModLoader = serviceProvider.GetService<PreSptModLoader>();
-            var app = serviceProvider.GetService<App>();
+            
+            // Initialize PreSptMods
+            var preSptLoadMods = serviceProvider.GetServices<IPreSptLoadMod>();
+            foreach (var preSptLoadMod in preSptLoadMods)
+            {
+                preSptLoadMod.PreSptLoad();
+            }
             var appContext = serviceProvider.GetService<ApplicationContext>();
-            // These are the mod assemblies we are gonna use on the PreSpt, PostDb and PostSpt loaders
+            // Add the Loaded Mod Assemblies for later
             appContext.AddValue(ContextVariableType.LOADED_MOD_ASSEMBLIES, assemblies);
             // This is the builder that will get use by the HttpServer to start up the web application
             appContext.AddValue(ContextVariableType.APP_BUILDER, builder);
+            
+            // Get the Built app and run it
+            var app = serviceProvider.GetService<App>();
             app.Run().Wait();
 
             var httpConfig = serviceProvider.GetService<ConfigServer>().GetConfig<HttpConfig>(ConfigTypes.HTTP);
@@ -45,6 +59,15 @@ public static class Program
         }
     }
 
+    private static void CreateAndRegisterLogger(WebApplicationBuilder builder)
+    {
+        builder.Logging.ClearProviders();
+        var logger = new LoggerConfiguration()
+            .ReadFrom.Configuration(builder.Configuration)
+            .CreateLogger();
+        builder.Logging.AddSerilog(logger);
+    }
+
     private static void RegisterModOverrideComponents(IServiceCollection builderServices, List<Assembly> assemblies)
     {
         // We get all the services from this assembly first, since mods will override them later
@@ -101,6 +124,8 @@ public static class Program
     private static void RegisterSptComponents(IServiceCollection builderServices)
     {
         // We get all the services from this assembly first, since mods will override them later
+        RegisterComponents(builderServices, typeof(Program).Assembly.GetTypes()
+            .Where(type => Attribute.IsDefined(type, typeof(Injectable))));
         RegisterComponents(builderServices, typeof(App).Assembly.GetTypes()
             .Where(type => Attribute.IsDefined(type, typeof(Injectable))));
     }