lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use separate assembly load contexts per plugin

Browse Source
This commit is contained in:
Patrick Barron 2023-01-15 17:00:38 -05:00
parent dc85d86ea1
commit a48f188874
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ namespace Emby.Server.Implementations.Plugins
{ {
private readonly string _pluginsPath; private readonly string _pluginsPath;
private readonly Version _appVersion; private readonly Version _appVersion;
private readonly AssemblyLoadContext _assemblyLoadContext; private readonly List<AssemblyLoadContext> _assemblyLoadContexts;
private readonly JsonSerializerOptions _jsonOptions; private readonly JsonSerializerOptions _jsonOptions;
private readonly ILogger<PluginManager> _logger; private readonly ILogger<PluginManager> _logger;
private readonly IApplicationHost _appHost; private readonly IApplicationHost _appHost;
@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Plugins
_minimumVersion = new Version(0, 0, 0, 1); _minimumVersion = new Version(0, 0, 0, 1);
_plugins = Directory.Exists(_pluginsPath) ? DiscoverPlugins().ToList() : new List<LocalPlugin>(); _plugins = Directory.Exists(_pluginsPath) ? DiscoverPlugins().ToList() : new List<LocalPlugin>();
_assemblyLoadContext = new AssemblyLoadContext("PluginContext", true); _assemblyLoadContexts = new List<AssemblyLoadContext>();
} }
private IHttpClientFactory HttpClientFactory private IHttpClientFactory HttpClientFactory
@ -128,7 +128,10 @@ namespace Emby.Server.Implementations.Plugins
Assembly assembly; Assembly assembly;
try try
{ {
assembly = _assemblyLoadContext.LoadFromAssemblyPath(file); var assemblyLoadContext = new AssemblyLoadContext($"{plugin.Name} ${plugin.Version}", true);
_assemblyLoadContexts.Add(assemblyLoadContext);
assembly = assemblyLoadContext.LoadFromAssemblyPath(file);
// Load all required types to verify that the plugin will load // Load all required types to verify that the plugin will load
assembly.GetTypes(); assembly.GetTypes();
@ -163,7 +166,10 @@ namespace Emby.Server.Implementations.Plugins
/// <inheritdoc /> /// <inheritdoc />
public void UnloadAssemblies() public void UnloadAssemblies()
{ {
_assemblyLoadContext.Unload(); foreach (var assemblyLoadContext in _assemblyLoadContexts)
{
assemblyLoadContext.Unload();
}
} }
/// <summary> /// <summary>