cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-31 00:50:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bind missing services in SetupApplication

Browse Source
This commit is contained in:
Jordan Brown
2020-04-22 20:15:52 -04:00
parent 825b224746
commit d1ad1bfb0d
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Core/Application.cs
-2
View File
@@ -90,8 +90,6 @@ namespace Tgstation.Server.Host.Core
// configure configuration
services.UseStandardConfig<UpdatesConfiguration>(Configuration);
services.UseStandardConfig<DatabaseConfiguration>(Configuration);
services.UseStandardConfig<FileLoggingConfiguration>(Configuration);
services.UseStandardConfig<ControlPanelConfiguration>(Configuration);
// enable options which give us config reloading
src/Tgstation.Server.Host/Setup/PostSetupServices.cs
+21 -6
View File
@@ -12,13 +12,28 @@ namespace Tgstation.Server.Host.Setup
public IPlatformIdentifier PlatformIdentifier { get; }
/// <inheritdoc />
public GeneralConfiguration GeneralConfiguration { get; }
public GeneralConfiguration GeneralConfiguration => generalConfigurationOptions.Value;
/// <inheritdoc />
public DatabaseConfiguration DatabaseConfiguration { get; }
public DatabaseConfiguration DatabaseConfiguration => databaseConfigurationOptions.Value;
/// <inheritdoc />
public FileLoggingConfiguration FileLoggingConfiguration { get; }
public FileLoggingConfiguration FileLoggingConfiguration => fileLoggingConfigurationOptions.Value;
/// <summary>
/// Backing <see cref="IOptions{TOptions}"/> for <see cref="GeneralConfiguration"/>.
/// </summary>
readonly IOptions<GeneralConfiguration> generalConfigurationOptions;
/// <summary>
/// Backing <see cref="IOptions{TOptions}"/> for <see cref="DatabaseConfiguration"/>.
/// </summary>
readonly IOptions<DatabaseConfiguration> databaseConfigurationOptions;
/// <summary>
/// Backing <see cref="IOptions{TOptions}"/> for <see cref="FileLoggingConfiguration"/>.
/// </summary>
readonly IOptions<FileLoggingConfiguration> fileLoggingConfigurationOptions;
/// <summary>
/// Initializes a new instance of the <see cref="PostSetupServices"/> <see langword="class"/>.
@@ -34,9 +49,9 @@ namespace Tgstation.Server.Host.Setup
IOptions<FileLoggingConfiguration> fileLoggingConfigurationOptions)
{
PlatformIdentifier = platformIdentifier ?? throw new ArgumentNullException(nameof(platformIdentifier));
GeneralConfiguration = generalConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(generalConfigurationOptions));
DatabaseConfiguration = databaseConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(databaseConfigurationOptions));
FileLoggingConfiguration = fileLoggingConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(fileLoggingConfigurationOptions));
this.generalConfigurationOptions = generalConfigurationOptions ?? throw new ArgumentNullException(nameof(generalConfigurationOptions));
this.databaseConfigurationOptions = databaseConfigurationOptions ?? throw new ArgumentNullException(nameof(databaseConfigurationOptions));
this.fileLoggingConfigurationOptions = fileLoggingConfigurationOptions ?? throw new ArgumentNullException(nameof(fileLoggingConfigurationOptions));
}
}
}
src/Tgstation.Server.Host/Setup/SetupApplication.cs
+2
View File
@@ -67,6 +67,8 @@ namespace Tgstation.Server.Host.Setup
services.AddSingleton<IAsyncDelayer, AsyncDelayer>();
services.UseStandardConfig<GeneralConfiguration>(Configuration);
services.UseStandardConfig<DatabaseConfiguration>(Configuration);
services.UseStandardConfig<FileLoggingConfiguration>(Configuration);
ConfigureHostedService(services);
}