- Added more logging, removed printing of exceptions

mbakkar · mbakkar · commit 0e4bb814459a · 2013-07-21T12:46:53.000-04:00
- RecordDecoderFactory throws DecoderException now in constructor
diff --git a/codec-dns/src/main/java/io/netty/handler/dns/DnsCallback.java b/codec-dns/src/main/java/io/netty/handler/dns/DnsCallback.java
@@ -22,6 +22,8 @@
 import io.netty.handler.codec.dns.Question;
 import io.netty.handler.codec.dns.Resource;
 import io.netty.handler.dns.decoder.RecordDecoderFactory;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,6 +54,7 @@
  */
 public class DnsCallback<T extends List<?>> implements Callable<T> {
 
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(DnsCallback.class);
     private static final List<Object> DEFAULT = new ArrayList<Object>();
     private static final Map<Integer, DnsCallback<?>> callbacks = new HashMap<Integer, DnsCallback<?>>();
 
@@ -190,7 +193,11 @@ private void nextDns() {
                         channel.write(queries[i]).sync();
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    StringBuilder string = new StringBuilder();
+                    for (int i = 0; i < dnsServerAddress.length; i++) {
+                        string.append(dnsServerAddress[i]).append(".");
+                    }
+                    logger.error("Failed to write to next DNS server in queue with address " + string.substring(0, string.length() - 1), e);
                     result = null;
                 }
             }
diff --git a/codec-dns/src/main/java/io/netty/handler/dns/DnsExchangeFactory.java b/codec-dns/src/main/java/io/netty/handler/dns/DnsExchangeFactory.java
@@ -122,6 +122,11 @@ public static boolean validAddress(byte[] address) {
             return callback.call() != null;
         } catch (Exception e) {
             removeChannel(dnsServerChannels.get(address));
+            StringBuilder string = new StringBuilder();
+            for (int i = 0; i < address.length; i++) {
+                string.append(address[i]).append(".");
+            }
+            logger.warn("Failed to add DNS server " + string.substring(0, string.length() - 1), e);
             return false;
         }
     }
@@ -476,6 +481,12 @@ protected static void removeChannel(Channel channel) {
                         try {
                             channel.close().sync();
                         } catch (Exception e) {
+                            byte[] address = entry.getKey();
+                            StringBuilder string = new StringBuilder();
+                            for (int i = 0; i < address.length; i++) {
+                                string.append(address[i]).append(".");
+                            }
+                            logger.error("Could not close channel for address " + string.substring(0, string.length() - 1), e);
                             e.printStackTrace();
                         } finally {
                             channel.eventLoop().shutdownGracefully();
diff --git a/codec-dns/src/main/java/io/netty/handler/dns/InboundDnsMessageHandler.java b/codec-dns/src/main/java/io/netty/handler/dns/InboundDnsMessageHandler.java
@@ -38,7 +38,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
             DnsExchangeFactory.removeChannel(ctx.channel());
             return;
         }
-        cause.printStackTrace();
+        ctx.fireExceptionCaught(cause);
     }
 
     /**
diff --git a/codec-dns/src/main/java/io/netty/handler/dns/decoder/RecordDecoderFactory.java b/codec-dns/src/main/java/io/netty/handler/dns/decoder/RecordDecoderFactory.java
@@ -15,6 +15,7 @@
  */
 package io.netty.handler.dns.decoder;
 
+import io.netty.handler.codec.DecoderException;
 import io.netty.handler.codec.dns.DnsEntry;
 import io.netty.handler.codec.dns.DnsResponse;
 import io.netty.handler.codec.dns.Resource;
@@ -86,7 +87,7 @@ public RecordDecoderFactory(Map<Integer, RecordDecoder<?>> customDecoders) {
      */
     public RecordDecoderFactory(boolean useDefaultDecoders, Map<Integer, RecordDecoder<?>> customDecoders) {
         if (!useDefaultDecoders && (customDecoders == null || customDecoders.isEmpty())) {
-            throw new IllegalStateException("No decoders have been included to be used with this factory.");
+            throw new DecoderException("No decoders have been included to be used with this factory.");
         }
         if (useDefaultDecoders) {
             decoders.put(DnsEntry.TYPE_A, new AddressDecoder(4));

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {`
`38`	`38`	`DnsExchangeFactory.removeChannel(ctx.channel());`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`		`- cause.printStackTrace();`
	`41`	`+ ctx.fireExceptionCaught(cause);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`