ouczbs/FastGithub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
陈国伟 2021-08-30 12:59:00 +08:00
parent b4ff9286ce
commit d655a5aec3
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
FastGithub.DomainResolve/DomainResolver.cs
View File

@ -28,6 +28,8 @@ namespace FastGithub.DomainResolve
private readonly ILogger<DomainResolver> logger; private readonly ILogger<DomainResolver> logger;
private readonly TimeSpan connectTimeout = TimeSpan.FromSeconds(5d); private readonly TimeSpan connectTimeout = TimeSpan.FromSeconds(5d);
private readonly TimeSpan disableIPExpiration = TimeSpan.FromMinutes(2d);
private readonly TimeSpan dnscryptExpiration = TimeSpan.FromMinutes(10d); private readonly TimeSpan dnscryptExpiration = TimeSpan.FromMinutes(10d);
private readonly TimeSpan fallbackExpiration = TimeSpan.FromMinutes(2d); private readonly TimeSpan fallbackExpiration = TimeSpan.FromMinutes(2d);
private readonly TimeSpan loopbackExpiration = TimeSpan.FromSeconds(5d); private readonly TimeSpan loopbackExpiration = TimeSpan.FromSeconds(5d);
@ -133,7 +135,6 @@ namespace FastGithub.DomainResolve
expiration = this.loopbackExpiration; expiration = this.loopbackExpiration;
} }
this.logger.LogInformation($"[{domain.Host}->{address}]");
this.domainResolveCache.Set(domain, address, expiration); this.domainResolveCache.Set(domain, address, expiration);
return address; return address;
} }
@ -171,7 +172,16 @@ namespace FastGithub.DomainResolve
var dnsClient = new DnsClient(dns); var dnsClient = new DnsClient(dns);
var addresses = await dnsClient.Lookup(domain.Host, RecordType.A, cancellationToken); var addresses = await dnsClient.Lookup(domain.Host, RecordType.A, cancellationToken);
addresses = addresses.Where(address => this.disableIPAddressCache.TryGetValue(address, out _) == false).ToList(); addresses = addresses.Where(address => this.disableIPAddressCache.TryGetValue(address, out _) == false).ToList();
return await this.FindFastValueAsync(addresses, domain.Port, cancellationToken); var address = await this.FindFastValueAsync(addresses, domain.Port, cancellationToken);
if (address == null)
{
this.logger.LogWarning($"dns({dns})解析不到{domain.Host}可用的ip解析");
}
else
{
this.logger.LogInformation($"dns({dns}): [{domain.Host}->{address}]");
}
return address;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -224,12 +234,12 @@ namespace FastGithub.DomainResolve
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
this.SetDisabled(address, TimeSpan.FromMilliseconds(2d)); this.SetDisabled(address, this.disableIPExpiration);
return default; return default;
} }
catch (Exception) catch (Exception)
{ {
this.SetDisabled(address, TimeSpan.FromMilliseconds(1d)); this.SetDisabled(address, this.disableIPExpiration);
await Task.Delay(this.connectTimeout, cancellationToken); await Task.Delay(this.connectTimeout, cancellationToken);
return default; return default;
} }