Gracefully fail on Cardigann definitions Exceptions (#595)

This commit is contained in:
kaso17
2016-10-29 18:01:43 +02:00
committed by GitHub
parent 595f006f22
commit 2b9b4282f4

View File

@@ -74,21 +74,28 @@ namespace Jackett.Services
{ {
logger.Info("Loading Cardigann definitions from: " + path); logger.Info("Loading Cardigann definitions from: " + path);
DirectoryInfo d = new DirectoryInfo(path); try
foreach (var file in d.GetFiles("*.yml"))
{ {
string DefinitionString = File.ReadAllText(file.FullName); DirectoryInfo d = new DirectoryInfo(path);
CardigannIndexer idx = new CardigannIndexer(this, container.Resolve<IWebClient>(), logger, container.Resolve<IProtectionService>(), DefinitionString);
if (indexers.ContainsKey(idx.ID)) foreach (var file in d.GetFiles("*.yml"))
{ {
logger.Debug(string.Format("Ignoring definition ID={0}, file={1}: Indexer already exists", idx.ID, file.FullName)); string DefinitionString = File.ReadAllText(file.FullName);
} CardigannIndexer idx = new CardigannIndexer(this, container.Resolve<IWebClient>(), logger, container.Resolve<IProtectionService>(), DefinitionString);
else if (indexers.ContainsKey(idx.ID))
{ {
indexers.Add(idx.ID, idx); logger.Debug(string.Format("Ignoring definition ID={0}, file={1}: Indexer already exists", idx.ID, file.FullName));
LoadIndexerConfig(idx); }
} else
{
indexers.Add(idx.ID, idx);
LoadIndexerConfig(idx);
}
}
}
catch (Exception ex)
{
logger.Error(ex, "Error while loading Cardigann definitions: "+ ex.Message);
} }
} }