From 04b41237bb259973944c35dc9351c4050ae0008b Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 5 May 2015 00:17:33 +0200
Subject: [PATCH] Add catch blocks at bootstrap node

---
 .../app/bootstrap/BootstrapNode.java          | 33 ++++++++++++++-----
 .../io/bitsquare/gui/main/MainViewModel.java  |  2 +-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
index 215b5618a3..a1c87b19c7 100644
--- a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
+++ b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
@@ -60,7 +60,7 @@ public class BootstrapNode {
         try {
             Number160 peerId = Number160.createHash(name);
 
-            DefaultEventExecutorGroup eventExecutorGroup = new DefaultEventExecutorGroup(250);
+            DefaultEventExecutorGroup eventExecutorGroup = new DefaultEventExecutorGroup(50);
             ChannelClientConfiguration clientConf = PeerBuilder.createDefaultChannelClientConfiguration();
             clientConf.pipelineFilter(new PeerBuilder.EventExecutorGroupFilter(eventExecutorGroup));
 
@@ -85,17 +85,29 @@ public class BootstrapNode {
             peer.peerBean().peerMap().addPeerMapChangeListener(new PeerMapChangeListener() {
                 @Override
                 public void peerInserted(PeerAddress peerAddress, boolean verified) {
-                    log.debug("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
+                    try {
+                        log.debug("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
+                    } catch (Throwable t) {
+                        log.error("Exception at peerInserted " + t.getMessage());
+                    }
                 }
 
                 @Override
                 public void peerRemoved(PeerAddress peerAddress, PeerStatistic peerStatistics) {
-                    log.debug("Peer removed: peerAddress=" + peerAddress + ", peerStatistics=" + peerStatistics);
+                    try {
+                        log.debug("Peer removed: peerAddress=" + peerAddress + ", peerStatistics=" + peerStatistics);
+                    } catch (Throwable t) {
+                        log.error("Exception at peerRemoved " + t.getMessage());
+                    }
                 }
 
                 @Override
                 public void peerUpdated(PeerAddress peerAddress, PeerStatistic peerStatistics) {
-                    // log.debug("Peer updated: peerAddress=" + peerAddress + ", peerStatistics=" + peerStatistics);
+                    try {
+                        //log.debug("Peer updated: peerAddress=" + peerAddress + ", peerStatistics=" + peerStatistics);
+                    } catch (Throwable t) {
+                        log.error("Exception at peerUpdated " + t.getMessage());
+                    }
                 }
             });
 
@@ -104,9 +116,13 @@ public class BootstrapNode {
                 while (true) {
                     if (peer.peerBean().peerMap().all().size() > 0) {
                         noPeersInfoPrinted = false;
-                        log.info("Number of peers online = " + peer.peerBean().peerMap().all().size());
-                        for (PeerAddress peerAddress : peer.peerBean().peerMap().all()) {
-                            log.info("Peer: " + peerAddress.toString());
+                        try {
+                            log.info("Number of peers online = " + peer.peerBean().peerMap().all().size());
+                            for (PeerAddress peerAddress : peer.peerBean().peerMap().all()) {
+                                log.info("Peer: " + peerAddress.toString());
+                            }
+                        } catch (Throwable t) {
+                            log.error("Exception at run loop " + t.getMessage());
                         }
                     }
                     else if (noPeersInfoPrinted) {
@@ -122,7 +138,8 @@ public class BootstrapNode {
                 }
             }).start();
 
-        } catch (Exception e) {
+        } catch (Throwable t) {
+            log.error("Fatal exception " + t.getMessage());
             if (peer != null)
                 peer.shutdown().awaitUninterruptibly();
         }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index a7dee57827..277c5f0956 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -62,7 +62,7 @@ import rx.Observable;
 class MainViewModel implements ViewModel {
     private static final Logger log = LoggerFactory.getLogger(MainViewModel.class);
 
-    private static final long BLOCKCHAIN_SYNC_TIMEOUT = 60000;
+    private static final long BLOCKCHAIN_SYNC_TIMEOUT = 30000;
 
     // BTC network
     final StringProperty blockchainSyncInfo = new SimpleStringProperty("Initializing");