diff --git a/ReallifeGamemode.Database/Models/DatabaseContext.cs b/ReallifeGamemode.Database/Models/DatabaseContext.cs index 56750058..145888ca 100644 --- a/ReallifeGamemode.Database/Models/DatabaseContext.cs +++ b/ReallifeGamemode.Database/Models/DatabaseContext.cs @@ -12,19 +12,22 @@ namespace ReallifeGamemode.Database.Models { public partial class DatabaseContext : DbContext { - private readonly ILoggerFactory loggerFactory; + public static ILoggerFactory LoggerFactory { get; set; } - public DatabaseContext(ILoggerFactory loggerFactory = null) { - this.loggerFactory = loggerFactory; + private readonly bool useLoggerFactory = false; + + public DatabaseContext(bool useLoggerFactory = false) + { + this.useLoggerFactory = useLoggerFactory; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { base.OnConfiguring(optionsBuilder); - if(loggerFactory != null) + if (useLoggerFactory && LoggerFactory != null) { - optionsBuilder.UseLoggerFactory(loggerFactory); + optionsBuilder.UseLoggerFactory(LoggerFactory); } optionsBuilder.UseMySql("Host=localhost;Port=3306;Database=gtav-devdb;Username=gtav-dev;Password=Test123"); diff --git a/ReallifeGamemode.Server.Core/Main.cs b/ReallifeGamemode.Server.Core/Main.cs index 7344a2d0..bceec473 100644 --- a/ReallifeGamemode.Server.Core/Main.cs +++ b/ReallifeGamemode.Server.Core/Main.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Core.API; @@ -26,6 +27,8 @@ namespace ReallifeGamemode.Server.Core API = api; EventHandler = eventHandler; + DatabaseContext.LoggerFactory = LogManager.Factory; + API.DisableDefaultCommandErrorMessages(); API.DisableDefaultSpawnBehavior(); API.SetGlobalChatEnabled(false); @@ -61,9 +64,9 @@ namespace ReallifeGamemode.Server.Core } } - public static DatabaseContext GetDbContext(bool useLoggerFactory = true) + public static DatabaseContext GetDbContext(bool useLoggerFactory = false) { - return new DatabaseContext(useLoggerFactory ? LogManager.Factory : null); + return new DatabaseContext(useLoggerFactory); } internal static TScript GetScript() where TScript : Script diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs index dfee8dbd..051044d5 100644 --- a/ReallifeGamemode.Server/Main.cs +++ b/ReallifeGamemode.Server/Main.cs @@ -43,8 +43,6 @@ namespace ReallifeGamemode.Server [ServerEvent(Event.ResourceStart)] public void OnResourceStart() { - System.Console.WriteLine(System.DateTime.Now.ToShortTimeString()); - var methods = Assembly.GetExecutingAssembly() .GetTypes() .SelectMany(t => t.GetMethods())