ASC.Common: DistributedTaskProgress: added own property CancellationToken
This commit is contained in:
parent
4db819e7fb
commit
9811aaca33
@ -53,10 +53,13 @@ public class DistributedTaskProgress : DistributedTask
|
||||
[ProtoMember(3)]
|
||||
protected int StepCount { get; set; }
|
||||
|
||||
protected CancellationToken CancellationToken { get; set; }
|
||||
|
||||
public virtual async Task RunJob(DistributedTask _, CancellationToken cancellationToken)
|
||||
{
|
||||
Percentage = 0;
|
||||
Status = DistributedTaskStatus.Running;
|
||||
CancellationToken = cancellationToken;
|
||||
|
||||
await DoJob();
|
||||
}
|
||||
|
@ -47,8 +47,6 @@ public class ReassignProgressItem : DistributedTaskProgress
|
||||
private bool _notify;
|
||||
private bool _deleteProfile;
|
||||
|
||||
private CancellationToken _cancellationToken;
|
||||
|
||||
public ReassignProgressItem(IServiceScopeFactory serviceScopeFactory)
|
||||
{
|
||||
_serviceScopeFactory = serviceScopeFactory;
|
||||
@ -70,13 +68,6 @@ public class ReassignProgressItem : DistributedTaskProgress
|
||||
IsCompleted = false;
|
||||
}
|
||||
|
||||
public override async Task RunJob(DistributedTask distributedTask, CancellationToken cancellationToken)
|
||||
{
|
||||
_cancellationToken = cancellationToken;
|
||||
|
||||
await base.RunJob(distributedTask, cancellationToken);
|
||||
}
|
||||
|
||||
protected override async Task DoJob()
|
||||
{
|
||||
await using var scope = _serviceScopeFactory.CreateAsyncScope();
|
||||
@ -167,7 +158,7 @@ public class ReassignProgressItem : DistributedTaskProgress
|
||||
PublishChanges();
|
||||
}
|
||||
|
||||
_cancellationToken.ThrowIfCancellationRequested();
|
||||
CancellationToken.ThrowIfCancellationRequested();
|
||||
}
|
||||
|
||||
private async Task SendSuccessNotifyAsync(UserManager userManager, StudioNotifyService studioNotifyService, MessageService messageService, MessageTarget messageTarget, DisplayUserSettingsHelper displayUserSettingsHelper)
|
||||
|
@ -214,7 +214,6 @@ abstract class FileOperation<T, TId> : FileOperation where T : FileOperationData
|
||||
protected ILinkDao LinkDao { get; private set; }
|
||||
protected IProviderDao ProviderDao { get; private set; }
|
||||
protected ILogger Logger { get; private set; }
|
||||
protected CancellationToken CancellationToken { get; private set; }
|
||||
protected internal List<TId> Folders { get; private set; }
|
||||
protected internal List<TId> Files { get; private set; }
|
||||
protected ExternalShareData CurrentShareData { get; private set; }
|
||||
|
Loading…
Reference in New Issue
Block a user