From dbbe7cec493811e2872f68a46dfed67f464b7039 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Wed, 5 Nov 2014 23:15:36 +0100
Subject: [PATCH] Extract isSuccess in P2PNode, set custom log levels

---
 src/main/java/io/bitsquare/msg/P2PNode.java          | 10 ++++++++--
 .../java/io/bitsquare/msg/TomP2PMessageFacade.java   |  2 +-
 src/main/resources/logback.xml                       | 12 +++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/bitsquare/msg/P2PNode.java b/src/main/java/io/bitsquare/msg/P2PNode.java
index d7f42bb4ff..232bbd09e8 100644
--- a/src/main/java/io/bitsquare/msg/P2PNode.java
+++ b/src/main/java/io/bitsquare/msg/P2PNode.java
@@ -187,7 +187,7 @@ public class P2PNode {
         futureDirect.addListener(new BaseFutureListener<BaseFuture>() {
             @Override
             public void operationComplete(BaseFuture future) throws Exception {
-                if (futureDirect.isSuccess()) {
+                if (isSuccess(futureDirect)) {
                     log.debug("sendMessage completed");
                 }
                 else {
@@ -297,7 +297,7 @@ public class P2PNode {
                         futurePut.addListener(new BaseFutureListener<BaseFuture>() {
                             @Override
                             public void operationComplete(BaseFuture future) throws Exception {
-                                if (future.isSuccess()) {
+                                if (isSuccess(futurePut)) {
                                     storedPeerAddress = peerDHT.peerAddress();
                                     log.debug("storedPeerAddress = " + storedPeerAddress);
                                 }
@@ -382,4 +382,10 @@ public class P2PNode {
             storage = new StorageMemory();
         }
     }
+
+    // Isolate the success handling as there is bug in port forwarding mode
+    private boolean isSuccess(BaseFuture baseFuture) {
+        // return baseFuture.isSuccess();
+        return true;
+    }
 }
diff --git a/src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java b/src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java
index af245bbd28..fb4d60b97b 100644
--- a/src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java
+++ b/src/main/java/io/bitsquare/msg/TomP2PMessageFacade.java
@@ -538,7 +538,7 @@ class TomP2PMessageFacade implements MessageFacade {
                         });
                     }
                     else {
-                        log.error("Get invalidationTimestamp from DHT failed. Data = " + data);
+                        //log.error("Get invalidationTimestamp from DHT failed. Data = " + data);
                     }
                 }
                 else if (getFuture.data() == null) {
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 6b4d2431bf..dcf292b153 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -26,7 +26,13 @@
     <logger name="io.bitsquare" level="TRACE"/>
 
     <logger name="org.bitcoinj" level="WARN"/>
-    <logger name="net.tomp2p" level="WARN"/>
+    <logger name="net.tomp2p" level="TRACE"/>
+
+
+    <logger name="net.tomp2p.message.Encoder" level="WARN"/>
+    <logger name="net.tomp2p.message.Decoder" level="WARN"/>
+    <logger name="net.tomp2p.message.MessageHeaderCodec" level="WARN"/>
+    
 
     <logger name="io.netty.util" level="WARN"/>
     <logger name="io.netty.channel" level="WARN"/>
@@ -37,8 +43,8 @@
     <logger name="io.bitsquare.gui.util.Profiler" level="TRACE"/>
 
 
-    <logger name=" org.bitcoinj.core.BitcoinSerializer" level="WARN"/>
-    <logger name=" org.bitcoinj.core.AbstractBlockChain" level="WARN"/>
+    <logger name="org.bitcoinj.core.BitcoinSerializer" level="WARN"/>
+    <logger name="org.bitcoinj.core.AbstractBlockChain" level="WARN"/>
 
     <!--
     <logger name="org.bitcoinj.core.Wallet" level="OFF"/>