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

Updated mooncore versions. Removed legacy configuration loading

Browse Source
This commit is contained in:
ChiaraBm
2025-02-28 11:01:31 +01:00
parent 8f1cc29b8d
commit 3699b8d54a
3 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MoonlightServers.ApiServer/Properties/launchSettings.json
View File

@@ -9,11 +9,10 @@
"applicationUrl": "http://localhost:5269", "applicationUrl": "http://localhost:5269",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development", "ASPNETCORE_ENVIRONMENT": "Development",
"MOONLIGHT_APP_PUBLICURL": "http://localhost:5269", "MOONLIGHT_PUBLICURL": "http://localhost:5269",
"HTTP_PROXY": "", "HTTP_PROXY": "",
"HTTPS_PROXY": "" "HTTPS_PROXY": ""
}, }
"commandLineArgs": "--frontend-asset js/XtermBlazor.min.js --frontend-asset js/moonlightServers.js --frontend-asset js/addon-fit.js"
} }
} }
} }

4
MoonlightServers.Daemon/MoonlightServers.Daemon.csproj
View File

@@ -9,8 +9,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Docker.DotNet" Version="3.125.15" /> <PackageReference Include="Docker.DotNet" Version="3.125.15" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" /> <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="MoonCore" Version="1.8.3" /> <PackageReference Include="MoonCore" Version="1.8.4" />
<PackageReference Include="MoonCore.Extended" Version="1.2.8" /> <PackageReference Include="MoonCore.Extended" Version="1.3.0" />
<PackageReference Include="MoonCore.Unix" Version="1.0.2" /> <PackageReference Include="MoonCore.Unix" Version="1.0.2" />
<PackageReference Include="Stateless" Version="5.17.0" /> <PackageReference Include="Stateless" Version="5.17.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>

44
MoonlightServers.Daemon/Startup.cs
View File

@@ -1,6 +1,7 @@
using System.Text.Json; using System.Text.Json;
using Docker.DotNet; using Docker.DotNet;
using MoonCore.Configuration; using MoonCore.Configuration;
using MoonCore.EnvConfiguration;
using MoonCore.Extended.Extensions; using MoonCore.Extended.Extensions;
using MoonCore.Extensions; using MoonCore.Extensions;
using MoonCore.Helpers; using MoonCore.Helpers;
@@ -17,8 +18,6 @@ public class Startup
// Configuration // Configuration
private AppConfiguration Configuration; private AppConfiguration Configuration;
private ConfigurationService ConfigurationService;
private ConfigurationOptions ConfigurationOptions;
// Logging // Logging
private ILoggerProvider[] LoggerProviders; private ILoggerProvider[] LoggerProviders;
@@ -119,42 +118,31 @@ public class Startup
#region Configurations #region Configurations
private Task SetupAppConfiguration() private async Task SetupAppConfiguration()
{ {
ConfigurationService = new ConfigurationService(); var configurationBuilder = new ConfigurationBuilder();
// Ensure configuration file exists
var jsonFilePath = PathBuilder.File(Directory.GetCurrentDirectory(), "storage", "app.json");
// Setup options if (!File.Exists(jsonFilePath))
ConfigurationOptions = new ConfigurationOptions(); await File.WriteAllTextAsync(jsonFilePath, JsonSerializer.Serialize(new AppConfiguration()));
ConfigurationOptions.AddConfiguration<AppConfiguration>("app"); configurationBuilder.AddJsonFile(
ConfigurationOptions.Path = PathBuilder.Dir("storage"); jsonFilePath
ConfigurationOptions.EnvironmentPrefix = "WebAppTemplate".ToUpper(); );
configurationBuilder.AddEnvironmentVariables(prefix: "MOONLIGHT_", separator: "_");
// Create minimal logger var configurationRoot = configurationBuilder.Build();
var loggerFactory = new LoggerFactory();
loggerFactory.AddMoonCore(configuration =>
{
configuration.Console.Enable = true;
configuration.Console.EnableAnsiMode = true;
configuration.FileLogging.Enable = false;
});
var logger = loggerFactory.CreateLogger<ConfigurationService>();
// Retrieve configuration // Retrieve configuration
Configuration = ConfigurationService.GetConfiguration<AppConfiguration>( Configuration = configurationRoot.Get<AppConfiguration>()!;
ConfigurationOptions,
logger
);
return Task.CompletedTask;
} }
private Task RegisterAppConfiguration() private Task RegisterAppConfiguration()
{ {
ConfigurationService.RegisterInDi(ConfigurationOptions, WebApplicationBuilder.Services); WebApplicationBuilder.Services.AddSingleton(Configuration);
WebApplicationBuilder.Services.AddSingleton(ConfigurationService);
return Task.CompletedTask; return Task.CompletedTask;
} }