Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove try-catch nesting

Browse Source
This commit is contained in:
David 2021-01-24 13:34:22 +01:00
parent 80f3e20394
commit 677bba742e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Emby.Server.Implementations/Plugins/PluginManager.cs
View File

@ -112,16 +112,7 @@ namespace Emby.Server.Implementations.Plugins
{ {
assembly = Assembly.LoadFrom(file); assembly = Assembly.LoadFrom(file);
try assembly.GetExportedTypes();
{
assembly.GetExportedTypes();
}
catch (TypeLoadException ex) // Undocumented exception
{
_logger.LogError(ex, "Failed to load assembly {Path}. This error occurs when a plugin references an incompatible version of one of the shared libraries. Disabling plugin.", file);
ChangePluginState(plugin, PluginStatus.NotSupported);
continue;
}
} }
catch (FileLoadException ex) catch (FileLoadException ex)
{ {
@ -129,6 +120,12 @@ namespace Emby.Server.Implementations.Plugins
ChangePluginState(plugin, PluginStatus.Malfunctioned); ChangePluginState(plugin, PluginStatus.Malfunctioned);
continue; continue;
} }
catch (TypeLoadException ex) // Undocumented exception
{
_logger.LogError(ex, "Failed to load assembly {Path}. This error occurs when a plugin references an incompatible version of one of the shared libraries. Disabling plugin.", file);
ChangePluginState(plugin, PluginStatus.NotSupported);
continue;
}
_logger.LogInformation("Loaded assembly {Assembly} from {Path}", assembly.FullName, file); _logger.LogInformation("Loaded assembly {Assembly} from {Path}", assembly.FullName, file);
yield return assembly; yield return assembly;