Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

improve error output when configuration is invalid

Browse Source
This commit is contained in:
RaidMax 2022-02-15 20:16:21 -06:00
parent 9a6d7c6a20
commit ea18a286b2
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/ApplicationManager.cs
View File

@ -412,7 +412,7 @@ namespace IW4MAdmin.Application
if (!validationResult.IsValid) if (!validationResult.IsValid)
{ {
throw new ConfigurationException(_translationLookup["MANAGER_CONFIGURATION_ERROR"]) throw new ConfigurationException("Could not validate configuration")
{ {
Errors = validationResult.Errors.Select(_error => _error.ErrorMessage).ToArray(), Errors = validationResult.Errors.Select(_error => _error.ErrorMessage).ToArray(),
ConfigurationFileName = ConfigHandler.FileName ConfigurationFileName = ConfigHandler.FileName

8
Application/Main.cs
View File

@ -18,6 +18,7 @@ using SharedLibraryCore.Repositories;
using SharedLibraryCore.Services; using SharedLibraryCore.Services;
using Stats.Dtos; using Stats.Dtos;
using System; using System;
using System.IO;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Text; using System.Text;
@ -138,11 +139,8 @@ namespace IW4MAdmin.Application
if (e is ConfigurationException configException) if (e is ConfigurationException configException)
{ {
if (translationLookup != null) Console.WriteLine("{{fileName}} contains an error."
{ .FormatExt(Path.GetFileName(configException.ConfigurationFileName)));
Console.WriteLine(translationLookup[configException.Message]
.FormatExt(configException.ConfigurationFileName));
}
foreach (var error in configException.Errors) foreach (var error in configException.Errors)
{ {

2
Application/Misc/BaseConfigurationHandler.cs
View File

@ -59,7 +59,7 @@ namespace IW4MAdmin.Application.Misc
catch (Exception e) catch (Exception e)
{ {
throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR") throw new ConfigurationException("Could not load configuration")
{ {
Errors = new[] { e.Message }, Errors = new[] { e.Message },
ConfigurationFileName = FileName ConfigurationFileName = FileName