optimize dns resolver timeout desc

qiniu · Aug 25, 2021 · e0f0007 · e0f0007
1 parent 65b20a0
commit e0f0007
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/HappyDNS/Dns/QNDnsResolver.m b/HappyDNS/Dns/QNDnsResolver.m
@@ -92,7 +92,8 @@ - (void)request:(NSString *)host
         [locker unlock];
 
         if (shouldCallBack) {
-            complete(nil, kQNDnsInvalidParamError(@"resolver timeout"));
+            NSString *error = [NSString stringWithFormat:@"resolver timeout for server:%@ host:%@",[self.servers description], host];
+            complete(nil, kQNDnsInvalidParamError(error));
         }
     });
 

diff --git a/HappyDNSTests/DohResolverTest.m b/HappyDNSTests/DohResolverTest.m
@@ -18,11 +18,12 @@ @implementation DohResolverTest
 
 - (void)testSimpleDns {
     NSString *host = @"en.wikipedia.org";
+    NSString *serverUrl = @"https://223.6.6.6/dns-query";
     NSError *err = nil;
 
     NSArray *typeArray = @[@(kQNTypeA), @(kQNTypeAAAA)];
     for (NSNumber *type in typeArray) {
-        QNDohResolver *server = [QNDohResolver resolverWithServer:@"https://dns.alidns.com/dns-query" recordType:type.intValue timeout:5];
+        QNDohResolver *server = [QNDohResolver resolverWithServer:serverUrl recordType:type.intValue timeout:2];
         NSArray *records = [server query:[[QNDomain alloc] init:host] networkInfo:nil error:&err];
         NSLog(@"== records:%@", records);
         XCTAssertNil(err, "query error:%@", err);
@@ -31,7 +32,7 @@ - (void)testSimpleDns {
     }
 
     for (NSNumber *type in typeArray) {
-        QNDohResolver *server = [QNDohResolver resolverWithServers:@[@"https://dns.alidns.com/dns-query"] recordType:type.intValue timeout:5];
+        QNDohResolver *server = [QNDohResolver resolverWithServers:@[serverUrl] recordType:type.intValue timeout:5];
         QNDnsManager *manager = [[QNDnsManager alloc] init:@[server] networkInfo:nil];
         NSArray *records = [manager queryRecords:host];
         NSLog(@"== records:%@", records);