更新LifetimeInterceptor

Author: xljiulang

WebApiClient/Internal/HttpApiFactories/InterceptorCleaner.cs

@@ -47,10 +47,13 @@ public void Add(LifetimeInterceptor interceptor)
  /// </summary>
  private async void StartCleanup()
  {
- while (this.Cleanup() == false)
+ do
  {
- await Task.Delay(this.CleanupInterval).ConfigureAwait(false);
+ await Task
+ .Delay(this.CleanupInterval)
+ .ConfigureAwait(false);
  }
+ while (this.Cleanup() == false);
  }
 
  /// <summary>
@@ -67,17 +70,15 @@ private bool Cleanup()
  if (entry.CanDispose == false)
  {
  this.trackingEntries.Enqueue(entry);
+ continue;
  }
- else
+
+ entry.Dispose();
+ if (Interlocked.Decrement(ref this.trackingEntryCount) == 0)
  {
- entry.Dispose();
- if (Interlocked.Decrement(ref this.trackingEntryCount) == 0)
- {
- return true;
- }
+ return true;
  }
  }
-
  return false;
  }
 

WebApiClient/Internal/HttpApiFactories/LifetimeInterceptor.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Threading.Tasks;
+using System.Threading;
 using WebApiClient.Defaults;
 
 namespace WebApiClient
@@ -9,6 +9,11 @@ namespace WebApiClient
  /// </summary>
  class LifetimeInterceptor : ApiInterceptor
  {
+ /// <summary>
+ /// Token取消源
+ /// </summary>
+ private readonly CancellationTokenSource tokenSource = new CancellationTokenSource();
+
  /// <summary>
  /// 具有生命周期的拦截器
  /// </summary>
@@ -24,10 +29,13 @@ public LifetimeInterceptor(HttpApiConfig httpApiConfig, TimeSpan lifeTime, Actio
  throw new ArgumentNullException(nameof(deactivateAction));
  }
 
- Task.Delay(lifeTime)
- .ConfigureAwait(false)
- .GetAwaiter()
- .OnCompleted(() => deactivateAction(this));
+ this.tokenSource.Token.Register(() =>
+ {
+ this.tokenSource.Dispose();
+ deactivateAction.Invoke(this);
+ }, useSynchronizationContext: false);
+
+ this.tokenSource.CancelAfter(lifeTime);
  }
 
  /// <summary>