mirror of https://github.com/lidarr/Lidarr
Fixed: Catch InvalidDataException during initial config to prevent boot loop
[Common]
This commit is contained in:
parent
64c5bee830
commit
94d7f56743
|
@ -211,11 +211,20 @@ namespace NzbDrone.Host
|
|||
private static IConfiguration GetConfiguration(StartupContext context)
|
||||
{
|
||||
var appFolder = new AppFolderInfo(context);
|
||||
return new ConfigurationBuilder()
|
||||
.AddXmlFile(appFolder.GetConfigPath(), optional: true, reloadOnChange: false)
|
||||
.AddInMemoryCollection(new List<KeyValuePair<string, string>> { new ("dataProtectionFolder", appFolder.GetDataProtectionPath()) })
|
||||
.AddEnvironmentVariables()
|
||||
.Build();
|
||||
var configPath = appFolder.GetConfigPath();
|
||||
|
||||
try
|
||||
{
|
||||
return new ConfigurationBuilder()
|
||||
.AddXmlFile(configPath, optional: true, reloadOnChange: false)
|
||||
.AddInMemoryCollection(new List<KeyValuePair<string, string>> { new ("dataProtectionFolder", appFolder.GetDataProtectionPath()) })
|
||||
.AddEnvironmentVariables()
|
||||
.Build();
|
||||
}
|
||||
catch (InvalidDataException ex)
|
||||
{
|
||||
throw new InvalidConfigFileException($"{configPath} is corrupt or invalid. Please delete the config file and Lidarr will recreate it.", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private static string BuildUrl(string scheme, string bindAddress, int port)
|
||||
|
|
Loading…
Reference in New Issue