network异常

xljiulang · xljiulang · commit 59fde288b55b · 2021-11-26T22:21:58.000+08:00
diff --git a/FastGithub.DomainResolve/IPAddressService.cs b/FastGithub.DomainResolve/IPAddressService.cs
@@ -24,8 +24,8 @@ private record DomainAddress(string Domain, IPAddress Address);
         private readonly IMemoryCache domainAddressCache = new MemoryCache(Options.Create(new MemoryCacheOptions()));
 
         private record AddressElapsed(IPAddress Address, TimeSpan Elapsed);
-        private readonly TimeSpan brokeElapsedExpiration = TimeSpan.FromMinutes(1d);
-        private readonly TimeSpan normaleElapsedExpiration = TimeSpan.FromMinutes(5d);
+        private readonly TimeSpan problemElapsedExpiration = TimeSpan.FromMinutes(1d);
+        private readonly TimeSpan normalElapsedExpiration = TimeSpan.FromMinutes(5d);
         private readonly TimeSpan connectTimeout = TimeSpan.FromSeconds(5d);
         private readonly IMemoryCache addressElapsedCache = new MemoryCache(Options.Create(new MemoryCacheOptions()));
 
@@ -107,14 +107,14 @@ private async Task<AddressElapsed> GetAddressElapsedAsync(IPEndPoint endPoint, C
                 await socket.ConnectAsync(endPoint, linkedTokenSource.Token);
 
                 addressElapsed = new AddressElapsed(endPoint.Address, stopWatch.Elapsed);
-                return this.addressElapsedCache.Set(endPoint, addressElapsed, this.normaleElapsedExpiration);
+                return this.addressElapsedCache.Set(endPoint, addressElapsed, this.normalElapsedExpiration);
             }
             catch (Exception ex)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
                 addressElapsed = new AddressElapsed(endPoint.Address, TimeSpan.MaxValue);
-                var expiration = IsLocalNetworkProblem(ex) ? this.brokeElapsedExpiration : this.normaleElapsedExpiration;
+                var expiration = IsLocalNetworkProblem(ex) ? this.problemElapsedExpiration : this.normalElapsedExpiration;
                 return this.addressElapsedCache.Set(endPoint, addressElapsed, expiration);
             }
             finally
@@ -136,9 +136,7 @@ private static bool IsLocalNetworkProblem(Exception ex)
             }
 
             var code = socketException.SocketErrorCode;
-            return code == SocketError.NetworkDown ||
-                code == SocketError.NetworkUnreachable ||
-                code == SocketError.HostUnreachable;
+            return code == SocketError.NetworkDown || code == SocketError.NetworkUnreachable;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ private record DomainAddress(string Domain, IPAddress Address);`
`24`	`24`	`private readonly IMemoryCache domainAddressCache = new MemoryCache(Options.Create(new MemoryCacheOptions()));`
`25`	`25`
`26`	`26`	`private record AddressElapsed(IPAddress Address, TimeSpan Elapsed);`
`27`		`- private readonly TimeSpan brokeElapsedExpiration = TimeSpan.FromMinutes(1d);`
`28`		`- private readonly TimeSpan normaleElapsedExpiration = TimeSpan.FromMinutes(5d);`
	`27`	`+ private readonly TimeSpan problemElapsedExpiration = TimeSpan.FromMinutes(1d);`
	`28`	`+ private readonly TimeSpan normalElapsedExpiration = TimeSpan.FromMinutes(5d);`
`29`	`29`	`private readonly TimeSpan connectTimeout = TimeSpan.FromSeconds(5d);`
`30`	`30`	`private readonly IMemoryCache addressElapsedCache = new MemoryCache(Options.Create(new MemoryCacheOptions()));`
`31`	`31`
`@@ -107,14 +107,14 @@ private async Task<AddressElapsed> GetAddressElapsedAsync(IPEndPoint endPoint, C`
`107`	`107`	`await socket.ConnectAsync(endPoint, linkedTokenSource.Token);`
`108`	`108`
`109`	`109`	`addressElapsed = new AddressElapsed(endPoint.Address, stopWatch.Elapsed);`
`110`		`- return this.addressElapsedCache.Set(endPoint, addressElapsed, this.normaleElapsedExpiration);`
	`110`	`+ return this.addressElapsedCache.Set(endPoint, addressElapsed, this.normalElapsedExpiration);`
`111`	`111`	`}`
`112`	`112`	`catch (Exception ex)`
`113`	`113`	`{`
`114`	`114`	`cancellationToken.ThrowIfCancellationRequested();`
`115`	`115`
`116`	`116`	`addressElapsed = new AddressElapsed(endPoint.Address, TimeSpan.MaxValue);`
`117`		`- var expiration = IsLocalNetworkProblem(ex) ? this.brokeElapsedExpiration : this.normaleElapsedExpiration;`
	`117`	`+ var expiration = IsLocalNetworkProblem(ex) ? this.problemElapsedExpiration : this.normalElapsedExpiration;`
`118`	`118`	`return this.addressElapsedCache.Set(endPoint, addressElapsed, expiration);`
`119`	`119`	`}`
`120`	`120`	`finally`
`@@ -136,9 +136,7 @@ private static bool IsLocalNetworkProblem(Exception ex)`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`var code = socketException.SocketErrorCode;`
`139`		`- return code == SocketError.NetworkDown \|\|`
`140`		`- code == SocketError.NetworkUnreachable \|\|`
`141`		`- code == SocketError.HostUnreachable;`
	`139`	`+ return code == SocketError.NetworkDown \|\| code == SocketError.NetworkUnreachable;`
`142`	`140`	`}`
`143`	`141`	`}`
`144`	`142`	`}`