判断cancellationToken是否已取消
This commit is contained in:
parent
762b6b01da
commit
0440790a5f
@ -74,6 +74,8 @@ namespace FastGithub.DomainResolve
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="domain"></param>
|
/// <param name="domain"></param>
|
||||||
/// <param name="cancellationToken"></param>
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <exception cref="OperationCanceledException"></exception>
|
||||||
|
/// <exception cref="FastGithubException"></exception>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<IPAddress> ResolveAsync(DnsEndPoint domain, CancellationToken cancellationToken = default)
|
public async Task<IPAddress> ResolveAsync(DnsEndPoint domain, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
@ -103,6 +105,7 @@ namespace FastGithub.DomainResolve
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="domain"></param>
|
/// <param name="domain"></param>
|
||||||
/// <param name="cancellationToken"></param>
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <exception cref="OperationCanceledException"></exception>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
private async Task<IPAddress?> ResolveCoreAsync(DnsEndPoint domain, CancellationToken cancellationToken)
|
private async Task<IPAddress?> ResolveCoreAsync(DnsEndPoint domain, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
@ -143,6 +146,7 @@ namespace FastGithub.DomainResolve
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="domain"></param>
|
/// <param name="domain"></param>
|
||||||
/// <param name="cancellationToken"></param>
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <exception cref="OperationCanceledException"></exception>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
private async Task<IPAddress?> LookupByFallbackAsync(DnsEndPoint domain, CancellationToken cancellationToken)
|
private async Task<IPAddress?> LookupByFallbackAsync(DnsEndPoint domain, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
@ -163,6 +167,7 @@ namespace FastGithub.DomainResolve
|
|||||||
/// <param name="dns"></param>
|
/// <param name="dns"></param>
|
||||||
/// <param name="domain"></param>
|
/// <param name="domain"></param>
|
||||||
/// <param name="cancellationToken"></param>
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <exception cref="OperationCanceledException"></exception>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
private async Task<IPAddress?> LookupAsync(IPEndPoint dns, DnsEndPoint domain, CancellationToken cancellationToken)
|
private async Task<IPAddress?> LookupAsync(IPEndPoint dns, DnsEndPoint domain, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
@ -184,6 +189,7 @@ namespace FastGithub.DomainResolve
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
this.logger.LogWarning($"dns({dns})无法解析{domain.Host}:{ex.Message}");
|
this.logger.LogWarning($"dns({dns})无法解析{domain.Host}:{ex.Message}");
|
||||||
return default;
|
return default;
|
||||||
}
|
}
|
||||||
@ -195,6 +201,7 @@ namespace FastGithub.DomainResolve
|
|||||||
/// <param name="addresses"></param>
|
/// <param name="addresses"></param>
|
||||||
/// <param name="port"></param>
|
/// <param name="port"></param>
|
||||||
/// <param name="cancellationToken"></param>
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <exception cref="OperationCanceledException"></exception>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
private async Task<IPAddress?> FindFastValueAsync(IEnumerable<IPAddress> addresses, int port, CancellationToken cancellationToken)
|
private async Task<IPAddress?> FindFastValueAsync(IEnumerable<IPAddress> addresses, int port, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
@ -220,6 +227,7 @@ namespace FastGithub.DomainResolve
|
|||||||
/// <param name="address"></param>
|
/// <param name="address"></param>
|
||||||
/// <param name="port"></param>
|
/// <param name="port"></param>
|
||||||
/// <param name="cancellationToken"></param>
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <exception cref="OperationCanceledException"></exception>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
private async Task<IPAddress?> IsAvailableAsync(IPAddress address, int port, CancellationToken cancellationToken)
|
private async Task<IPAddress?> IsAvailableAsync(IPAddress address, int port, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
@ -233,6 +241,7 @@ namespace FastGithub.DomainResolve
|
|||||||
}
|
}
|
||||||
catch (OperationCanceledException)
|
catch (OperationCanceledException)
|
||||||
{
|
{
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
this.SetDisabled(address);
|
this.SetDisabled(address);
|
||||||
return default;
|
return default;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -64,7 +64,7 @@
|
|||||||
<div class="os">linux本机</div>
|
<div class="os">linux本机</div>
|
||||||
<div class="caption">
|
<div class="caption">
|
||||||
<h4>x64系统</h4>
|
<h4>x64系统</h4>
|
||||||
<p>执行<code>./FastGithub</code></p>
|
<p>执行<code>sudo ./FastGithub</code></p>
|
||||||
<p>手工添加127.0.0.1做为/etc/resolv.conf的第一条记录</p>
|
<p>手工添加127.0.0.1做为/etc/resolv.conf的第一条记录</p>
|
||||||
<p>手工安装CACert/FastGithub.cer到受信任的根证书颁发机构</p>
|
<p>手工安装CACert/FastGithub.cer到受信任的根证书颁发机构</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user