diff --git a/ProjectLighthouse.Tests/DatabaseFact.cs b/ProjectLighthouse.Tests/DatabaseFact.cs index 216ea62a..df9a357c 100644 --- a/ProjectLighthouse.Tests/DatabaseFact.cs +++ b/ProjectLighthouse.Tests/DatabaseFact.cs @@ -8,7 +8,7 @@ namespace LBPUnion.ProjectLighthouse.Tests { public DatabaseFact() { - ServerStatics.DbConnectionString = "server=127.0.0.1;uid=root;pwd=lighthouse;database=lighthouse"; + ServerSettings.Instance.DbConnectionString = "server=127.0.0.1;uid=root;pwd=lighthouse;database=lighthouse"; if (!ServerStatics.DbConnected) { this.Skip = "Database not available"; diff --git a/ProjectLighthouse/Database.cs b/ProjectLighthouse/Database.cs index 58d725bc..a7051327 100644 --- a/ProjectLighthouse/Database.cs +++ b/ProjectLighthouse/Database.cs @@ -30,7 +30,7 @@ namespace LBPUnion.ProjectLighthouse public DbSet RatedLevels { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder options) - => options.UseMySql(ServerStatics.DbConnectionString, MySqlServerVersion.LatestSupportedServerVersion); + => options.UseMySql(ServerSettings.Instance.DbConnectionString, MySqlServerVersion.LatestSupportedServerVersion); public async Task CreateUser(string username) { diff --git a/ProjectLighthouse/Types/Settings/ServerSettings.cs b/ProjectLighthouse/Types/Settings/ServerSettings.cs index 7f8c1815..ae80e28e 100644 --- a/ProjectLighthouse/Types/Settings/ServerSettings.cs +++ b/ProjectLighthouse/Types/Settings/ServerSettings.cs @@ -66,7 +66,7 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings [NotNull] public static ServerSettings Instance; - public const int CurrentConfigVersion = 1; + public const int CurrentConfigVersion = 2; [JsonPropertyName("ConfigVersionDoNotModifyOrYouWillBeSlapped")] public int ConfigVersion { get; set; } = CurrentConfigVersion; @@ -80,5 +80,7 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings public string InfluxToken { get; set; } = ""; public string EulaText { get; set; } = ""; + + public string DbConnectionString { get; set; } = "server=127.0.0.1;uid=root;pwd=lighthouse;database=lighthouse"; } } \ No newline at end of file diff --git a/ProjectLighthouse/Types/Settings/ServerStatics.cs b/ProjectLighthouse/Types/Settings/ServerStatics.cs index fe1a3a78..24be656f 100644 --- a/ProjectLighthouse/Types/Settings/ServerStatics.cs +++ b/ProjectLighthouse/Types/Settings/ServerStatics.cs @@ -16,17 +16,6 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings public const string ServerName = "ProjectLighthouse"; - private static string? dbConnectionString; - - public static string DbConnectionString { - get { - if (dbConnectionString == null) return dbConnectionString = Environment.GetEnvironmentVariable("LIGHTHOUSE_DB_CONNECTION_STRING") ?? ""; - - return dbConnectionString; - } - set => dbConnectionString = value; - } - public static bool DbConnected { get { try