quartznet/pulsar
2
0
Fork 0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 17:39:39 -04:00
Code Actions

Fixes to PluginManager for proper Notifier plugin handling

Browse Source 
Addresses 2 issues:
1) If a single plugin class implemented both the Worker and Notifier interfaces, multiple instances of the class were created, meaning no shared state within the plugin. Now only 1 instance is created.
2) Plugins implementing only Notifier weren't properly loaded.
This commit is contained in:
Fred Kuipers 2021-08-10 00:44:14 -04:00
parent 3f8cfca39a
commit a4ad2fdd7d
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ObservatoryCore/PluginManagement/PluginManager.cs
View File

@ -59,6 +59,15 @@ namespace Observatory.PluginManagement
LoadSettings(plugin); LoadSettings(plugin);
plugin.Load(core); plugin.Load(core);
} }
foreach (var plugin in notifyPlugins.Select(p => p.plugin))
{
// Notifiers which are also workers need not be loaded again (they are the same instance).
if (!plugin.GetType().IsAssignableTo(typeof(IObservatoryWorker)))
{
LoadSettings(plugin);
plugin.Load(core);
}
}
core.Notification += pluginHandler.OnNotificationEvent; core.Notification += pluginHandler.OnNotificationEvent;
} }
@ -228,10 +237,18 @@ namespace Observatory.PluginManagement
ConstructorInfo constructor = worker.GetConstructor(Array.Empty<Type>()); ConstructorInfo constructor = worker.GetConstructor(Array.Empty<Type>());
object instance = constructor.Invoke(Array.Empty<object>()); object instance = constructor.Invoke(Array.Empty<object>());
workers.Add((instance as IObservatoryWorker, PluginStatus.Signed)); workers.Add((instance as IObservatoryWorker, PluginStatus.Signed));
if (instance is IObservatoryNotifier)
{
// This is also a notifier; add to the notifier list as well, so the work and notifier are
// the same instance and can share state.
notifiers.Add((instance as IObservatoryNotifier, PluginStatus.Signed));
}
pluginCount++; pluginCount++;
} }
var notifyTypes = types.Where(t => t.IsAssignableTo(typeof(IObservatoryNotifier))); // Filter out items which are also workers as we've already created them above.
var notifyTypes = types.Where(t =>
t.IsAssignableTo(typeof(IObservatoryNotifier)) && !t.IsAssignableTo(typeof(IObservatoryWorker)));
foreach (var notifier in notifyTypes) foreach (var notifier in notifyTypes)
{ {
ConstructorInfo constructor = notifier.GetConstructor(Array.Empty<Type>()); ConstructorInfo constructor = notifier.GetConstructor(Array.Empty<Type>());