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

Revert PluginCore use of event listening for current LogMonitor state (#64)

Browse Source 
The order that listeners get notified isn't deterministic and as a result plugins which read the current state from PluginCore during the handling of a state change event may read a stale state resulting in unexpected results. PluginCore now reads a property directly from LogMonitor to avoid such inconsistencies.
This commit is contained in:
F K 2022-03-15 09:44:20 -04:00 committed by GitHub
parent 4f4ba88878
commit fa5c978b34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ObservatoryCore/LogMonitor.cs
View File

@ -38,6 +38,13 @@ namespace Observatory
#endregion
#region Public properties
public LogMonitorState CurrentState
{
get => currentState;
}
#endregion
#region Public Methods
public void Start()

10
ObservatoryCore/PluginManagement/PluginCore.cs
View File

@ -11,7 +11,6 @@ namespace Observatory.PluginManagement
private readonly NativeVoice NativeVoice;
private readonly NativePopup NativePopup;
private LogMonitorState currentLogMonitorState = LogMonitorState.Idle;
public PluginCore()
{
@ -19,11 +18,6 @@ namespace Observatory.PluginManagement
NativePopup = new();
}
internal void OnLogMonitorStateChanged(object sender, LogMonitorStateChangedEventArgs e)
{
currentLogMonitorState = e.NewState;
}
public string Version => System.Reflection.Assembly.GetEntryAssembly().GetName().Version.ToString();
public Status GetStatus()
@ -142,12 +136,12 @@ namespace Observatory.PluginManagement
public LogMonitorState CurrentLogMonitorState
{
get => currentLogMonitorState;
get => LogMonitor.GetInstance.CurrentState;
}
public bool IsLogMonitorBatchReading
{
get => LogMonitorStateChangedEventArgs.IsBatchRead(currentLogMonitorState);
get => LogMonitorStateChangedEventArgs.IsBatchRead(LogMonitor.GetInstance.CurrentState);
}
public event EventHandler<NotificationArgs> Notification;

1
ObservatoryCore/PluginManagement/PluginManager.cs
View File

@ -49,7 +49,6 @@ namespace Observatory.PluginManagement
logMonitor.LogMonitorStateChanged += pluginHandler.OnLogMonitorStateChanged;
var core = new PluginCore();
logMonitor.LogMonitorStateChanged += core.OnLogMonitorStateChanged;
List<IObservatoryPlugin> errorPlugins = new();