Improve query/cache log statements by including type and id

ibauersachs · ibauersachs · commit d244bf47e99f · 2020-06-06T17:38:29.000+02:00
diff --git a/src/main/java/org/xbill/DNS/Cache.java b/src/main/java/org/xbill/DNS/Cache.java
@@ -729,7 +729,11 @@ public SetResponse addMessage(Message in) {
       addRRset(rRset, cred);
     }
 
-    log.debug("caching {} for {}", response, in.getQuestion().getName());
+    log.debug(
+        "Caching {} for {}/{}",
+        response,
+        in.getQuestion().getName(),
+        Type.string(in.getQuestion().getType()));
     return response;
   }
 
diff --git a/src/main/java/org/xbill/DNS/Lookup.java b/src/main/java/org/xbill/DNS/Lookup.java
@@ -479,7 +479,7 @@ private void processResponse(Name name, SetResponse response) {
 
   private void lookup(Name current) {
     SetResponse sr = cache.lookupRecords(current, type, credibility);
-    log.debug("lookup {} {}, cache answer: {}", current, Type.string(type), sr);
+    log.debug("Lookup for {}/{}, cache answer: {}", current, Type.string(type), sr);
 
     processResponse(current, sr);
     if (done || doneCurrent) {
@@ -492,7 +492,13 @@ private void lookup(Name current) {
     try {
       response = resolver.send(query);
     } catch (IOException e) {
-      log.debug("Lookup failed using resolver {}", resolver, e);
+      log.debug(
+          "Lookup for {}/{}, id={} failed using resolver {}",
+          current,
+          Type.string(query.getQuestion().getType()),
+          query.getHeader().getID(),
+          resolver,
+          e);
 
       // A network error occurred.  Press on.
       if (e instanceof InterruptedIOException) {
@@ -523,7 +529,8 @@ private void lookup(Name current) {
       sr = cache.lookupRecords(current, type, credibility);
     }
 
-    log.debug("Queried {} {}: {}", current, Type.string(type), sr);
+    log.debug(
+        "Queried {}/{}, id={}: {}", current, Type.string(type), response.getHeader().getID(), sr);
     processResponse(current, sr);
   }
 
diff --git a/src/main/java/org/xbill/DNS/config/SunJvmResolverConfigProvider.java b/src/main/java/org/xbill/DNS/config/SunJvmResolverConfigProvider.java
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 package org.xbill.DNS.config;
 
-
 import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 import java.util.List;

Original file line number	Diff line number	Diff line change
`@@ -729,7 +729,11 @@ public SetResponse addMessage(Message in) {`
`729`	`729`	`addRRset(rRset, cred);`
`730`	`730`	`}`
`731`	`731`
`732`		`- log.debug("caching {} for {}", response, in.getQuestion().getName());`
	`732`	`+ log.debug(`
	`733`	`+ "Caching {} for {}/{}",`
	`734`	`+ response,`
	`735`	`+ in.getQuestion().getName(),`
	`736`	`+ Type.string(in.getQuestion().getType()));`
`733`	`737`	`return response;`
`734`	`738`	`}`
`735`	`739`