Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started with docker compose config. Switched to new config system. Upgraded mooncore packages

Browse Source
This commit is contained in:
Masu Baumgartner
2024-11-03 01:30:53 +01:00
parent b0a044db97
commit b73c3ebfb3
15 changed files with 128 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moonlight.ApiServer/Helpers/ApplicationStateHelper.cs
View File

@@ -5,7 +5,7 @@ namespace Moonlight.ApiServer.Helpers;
public class ApplicationStateHelper
{
public static ConfigService<AppConfiguration>? Configuration { get; private set; }
public static AppConfiguration Configuration { get; private set; }
public static void SetConfiguration(ConfigService<AppConfiguration>? configuration) => Configuration = configuration;
public static void SetConfiguration(AppConfiguration configuration) => Configuration = configuration;
}

14
Moonlight.ApiServer/Helpers/DatabaseContext.cs
View File

@@ -8,12 +8,12 @@ namespace Moonlight.ApiServer.Helpers;
public abstract class DatabaseContext : DbContext
{
private ConfigService<AppConfiguration>? ConfigService;
private AppConfiguration? Configuration;
public abstract string Prefix { get; }
public DatabaseContext()
{
ConfigService = ApplicationStateHelper.Configuration;
Configuration = ApplicationStateHelper.Configuration;
}
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -23,14 +23,14 @@ public abstract class DatabaseContext : DbContext
// If no config service has been configured, we are probably
// in a EF Core migration, so we need to construct the config manually
if (ConfigService == null)
if (Configuration == null)
{
ConfigService = new ConfigService<AppConfiguration>(
PathBuilder.File("storage", "config.json")
);
Configuration = new ConfigService<AppConfiguration>(
PathBuilder.File("storage", "app.json")
).Get();
}
var config = ConfigService.Get().Database;
var config = Configuration.Database;
var connectionString = $"host={config.Host};" +
$"port={config.Port};" +