Improve handling of failing dns resolvers

safing · Jul 20, 2020 · 25a3f60 · 25a3f60
1 parent 8dea8e6
commit 25a3f60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/resolver/resolve.go b/resolver/resolve.go
@@ -302,16 +302,14 @@ resolveLoop:
 					// we are offline and this is not an online check query
 					return nil, ErrOffline
 				default:
+					// includes ErrTimeout
 					log.Tracer(ctx).Debugf("resolver: failed to resolve %s: %s", q.FQDN, err)
 				}
-			} else {
-				// no error
-				if rrCache == nil {
-					// defensive: assume NXDomain
-					return nil, ErrNotFound
-				}
-				break resolveLoop
 			}
+			if rrCache == nil {
+				continue
+			}
+			break resolveLoop
 		}
 	}
 

diff --git a/resolver/resolver.go b/resolver/resolver.go
@@ -28,7 +28,7 @@ const (
 
 var (
 	// FailThreshold is amount of errors a resolvers must experience in order to be regarded as failed.
-	FailThreshold = 5
+	FailThreshold = 20
 )
 
 // Resolver holds information about an active resolver.