Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-05-21 00:32:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add DbConnectionString to config

Browse source
This commit is contained in:
jvyden 2021-11-19 00:25:41 -05:00
parent 76aeb54da0
commit 177befde91
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
4 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ProjectLighthouse.Tests/DatabaseFact.cs
View file

@ -8,7 +8,7 @@ namespace LBPUnion.ProjectLighthouse.Tests
{ {
public DatabaseFact() 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) if (!ServerStatics.DbConnected)
{ {
this.Skip = "Database not available"; this.Skip = "Database not available";

2
ProjectLighthouse/Database.cs
View file

@ -30,7 +30,7 @@ namespace LBPUnion.ProjectLighthouse
public DbSet<RatedLevel> RatedLevels { get; set; } public DbSet<RatedLevel> RatedLevels { get; set; }
protected override void OnConfiguring(DbContextOptionsBuilder options) protected override void OnConfiguring(DbContextOptionsBuilder options)
=> options.UseMySql(ServerStatics.DbConnectionString, MySqlServerVersion.LatestSupportedServerVersion); => options.UseMySql(ServerSettings.Instance.DbConnectionString, MySqlServerVersion.LatestSupportedServerVersion);
public async Task<User> CreateUser(string username) public async Task<User> CreateUser(string username)
{ {

4
ProjectLighthouse/Types/Settings/ServerSettings.cs
View file

@ -66,7 +66,7 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings
[NotNull] [NotNull]
public static ServerSettings Instance; public static ServerSettings Instance;
public const int CurrentConfigVersion = 1; public const int CurrentConfigVersion = 2;
[JsonPropertyName("ConfigVersionDoNotModifyOrYouWillBeSlapped")] [JsonPropertyName("ConfigVersionDoNotModifyOrYouWillBeSlapped")]
public int ConfigVersion { get; set; } = CurrentConfigVersion; public int ConfigVersion { get; set; } = CurrentConfigVersion;
@ -80,5 +80,7 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings
public string InfluxToken { get; set; } = ""; public string InfluxToken { get; set; } = "";
public string EulaText { get; set; } = ""; public string EulaText { get; set; } = "";
public string DbConnectionString { get; set; } = "server=127.0.0.1;uid=root;pwd=lighthouse;database=lighthouse";
} }
} }

11
ProjectLighthouse/Types/Settings/ServerStatics.cs
View file

@ -16,17 +16,6 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings
public const string ServerName = "ProjectLighthouse"; 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 { public static bool DbConnected {
get { get {
try try