|
@@ -214,7 +214,7 @@ namespace YSAI.Core.relay
|
|
|
{
|
|
{
|
|
|
OnEventHandler(this, new EventResult(false, $"配置文件不存在"));
|
|
OnEventHandler(this, new EventResult(false, $"配置文件不存在"));
|
|
|
}
|
|
}
|
|
|
- }, tokenSource?.Token ?? CancellationToken.None);
|
|
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -247,11 +247,11 @@ namespace YSAI.Core.relay
|
|
|
/// 监控任务
|
|
/// 监控任务
|
|
|
/// </summary>
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
|
- public Task WatcherTask()
|
|
|
|
|
|
|
+ public Task WatcherTask(CancellationTokenSource tokenSource)
|
|
|
{
|
|
{
|
|
|
return Task.Factory.StartNew(() =>
|
|
return Task.Factory.StartNew(() =>
|
|
|
{
|
|
{
|
|
|
- while (!WatcherToken.IsCancellationRequested)
|
|
|
|
|
|
|
+ while (!tokenSource.IsCancellationRequested)
|
|
|
{
|
|
{
|
|
|
//队列数据
|
|
//队列数据
|
|
|
WatcherData? watcherData;
|
|
WatcherData? watcherData;
|
|
@@ -428,7 +428,7 @@ namespace YSAI.Core.relay
|
|
|
}
|
|
}
|
|
|
Thread.Sleep(1000);
|
|
Thread.Sleep(1000);
|
|
|
}
|
|
}
|
|
|
- }, WatcherToken.Token);
|
|
|
|
|
|
|
+ }, tokenSource.Token);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -443,7 +443,7 @@ namespace YSAI.Core.relay
|
|
|
{
|
|
{
|
|
|
WatcherQueue = new ConcurrentQueue<WatcherData>();
|
|
WatcherQueue = new ConcurrentQueue<WatcherData>();
|
|
|
WatcherToken = new CancellationTokenSource();
|
|
WatcherToken = new CancellationTokenSource();
|
|
|
- WatcherTask();
|
|
|
|
|
|
|
+ WatcherTask(WatcherToken);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
WatcherQueue.Enqueue(new WatcherData { e = e, Type = Type, WType = WatcherData.WatcherType.Deleted });
|
|
WatcherQueue.Enqueue(new WatcherData { e = e, Type = Type, WType = WatcherData.WatcherType.Deleted });
|
|
@@ -461,7 +461,7 @@ namespace YSAI.Core.relay
|
|
|
{
|
|
{
|
|
|
WatcherQueue = new ConcurrentQueue<WatcherData>();
|
|
WatcherQueue = new ConcurrentQueue<WatcherData>();
|
|
|
WatcherToken = new CancellationTokenSource();
|
|
WatcherToken = new CancellationTokenSource();
|
|
|
- WatcherTask();
|
|
|
|
|
|
|
+ WatcherTask(WatcherToken);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
WatcherQueue.Enqueue(new WatcherData { e = e, Type = Type, WType = WatcherData.WatcherType.Created });
|
|
WatcherQueue.Enqueue(new WatcherData { e = e, Type = Type, WType = WatcherData.WatcherType.Created });
|