mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-10-30 07:22:35 +01:00
Fixed: Catch InvalidDataException during initial config to prevent boot loop
(cherry picked from commit 9862584611f29ac3f16e0c6ef0afb183ff3f0588)
This commit is contained in:
parent
77efc4cc40
commit
3a6c078b30
@ -198,11 +198,20 @@ namespace NzbDrone.Host
|
|||||||
private static IConfiguration GetConfiguration(StartupContext context)
|
private static IConfiguration GetConfiguration(StartupContext context)
|
||||||
{
|
{
|
||||||
var appFolder = new AppFolderInfo(context);
|
var appFolder = new AppFolderInfo(context);
|
||||||
|
var configPath = appFolder.GetConfigPath();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
return new ConfigurationBuilder()
|
return new ConfigurationBuilder()
|
||||||
.AddXmlFile(appFolder.GetConfigPath(), optional: true, reloadOnChange: false)
|
.AddXmlFile(configPath, optional: true, reloadOnChange: false)
|
||||||
.AddInMemoryCollection(new List<KeyValuePair<string, string>> { new ("dataProtectionFolder", appFolder.GetDataProtectionPath()) })
|
.AddInMemoryCollection(new List<KeyValuePair<string, string>> { new ("dataProtectionFolder", appFolder.GetDataProtectionPath()) })
|
||||||
.Build();
|
.Build();
|
||||||
}
|
}
|
||||||
|
catch (InvalidDataException ex)
|
||||||
|
{
|
||||||
|
throw new InvalidConfigFileException($"{configPath} is corrupt or invalid. Please delete the config file and Sonarr will recreate it.", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static string BuildUrl(string scheme, string bindAddress, int port)
|
private static string BuildUrl(string scheme, string bindAddress, int port)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user