只保留 socket异常缓存

tomyyy2 · Nov 24, 2021 · a5d79b4 · a5d79b4
1 parent aba0ea7
commit a5d79b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>2.1.0</Version>	
+		<Version>2.1.1</Version>	
 		<Nullable>enable</Nullable>
 		<TargetFramework>net6.0</TargetFramework>
 		<IsWebConfigTransformDisabled>true</IsWebConfigTransformDisabled> 		

diff --git a/FastGithub.DomainResolve/DnsClient.cs b/FastGithub.DomainResolve/DnsClient.cs
@@ -31,7 +31,7 @@ sealed class DnsClient
         private readonly ILogger<DnsClient> logger;
 
         private readonly ConcurrentDictionary<string, SemaphoreSlim> semaphoreSlims = new();
-        private readonly IMemoryCache dnsCache = new MemoryCache(Options.Create(new MemoryCacheOptions()));
+        private readonly IMemoryCache dnsLookupCache = new MemoryCache(Options.Create(new MemoryCacheOptions()));
 
         private readonly TimeSpan minTimeToLive = TimeSpan.FromSeconds(30d);
         private readonly TimeSpan maxTimeToLive = TimeSpan.FromMinutes(10d);
@@ -118,13 +118,13 @@ private async Task<IList<IPAddress>> LookupAsync(IPEndPoint dns, DnsEndPoint end
 
             try
             {
-                if (this.dnsCache.TryGetValue<IList<IPAddress>>(key, out var value))
+                if (this.dnsLookupCache.TryGetValue<IList<IPAddress>>(key, out var value))
                 {
                     return value;
                 }
 
                 var result = await this.LookupCoreAsync(dns, endPoint, fastSort, cancellationToken);
-                return this.dnsCache.Set(key, result.Addresses, result.TimeToLive);
+                return this.dnsLookupCache.Set(key, result.Addresses, result.TimeToLive);
             }
             catch (OperationCanceledException)
             {
@@ -133,12 +133,12 @@ private async Task<IList<IPAddress>> LookupAsync(IPEndPoint dns, DnsEndPoint end
             catch (SocketException ex)
             {
                 this.logger.LogWarning($"{endPoint.Host}@{dns}：{ex.Message}");
-                return this.dnsCache.Set(key, Array.Empty<IPAddress>(), this.minTimeToLive);
+                return this.dnsLookupCache.Set(key, Array.Empty<IPAddress>(), this.minTimeToLive);
             }
             catch (Exception ex)
             {
                 this.logger.LogWarning($"{endPoint.Host}@{dns}：{ex.Message}");
-                return this.dnsCache.Set(key, Array.Empty<IPAddress>(), this.minTimeToLive);
+                return Array.Empty<IPAddress>();
             }
             finally
             {